Peter Korsgaard b108fdcb83 Merge branch 'next' ... Conflicts: Makefile package/dmraid/Config.in package/gdb/Config.in.host package/linux-headers/linux-headers.mk package/python/python.mk package/python3/python3.mk package/rt-tests/Config.in package/sdl/sdl.mk package/systemd/systemd-01-fix-getty-unit.patch package/systemd/systemd-02-fix-page-size.patch package/systemd/systemd-03-uclibc-fix.patch package/udev/Config.in package/udisks/Config.in package/vlc/vlc.mk system/Config.in Quite some merge conflicts, hopefully I didn't screw up anything. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2014-02-28 14:30:23 +01:00
..
libxcb	libxcb: re-disable building documentation for the host	2014-01-06 14:16:20 +01:00
mcookie
mesa3d
xapp_appres
xapp_bdftopcf
xapp_beforelight
xapp_bitmap
xapp_editres
xapp_fonttosfnt
xapp_fslsfonts
xapp_fstobdf
xapp_iceauth
xapp_ico
xapp_listres
xapp_luit
xapp_mkfontdir
xapp_mkfontscale
xapp_oclock
xapp_rgb
xapp_rstart
xapp_scripts
xapp_sessreg
xapp_setxkbmap
xapp_showfont
xapp_smproxy
xapp_twm
xapp_viewres
xapp_x11perf
xapp_xauth
xapp_xbacklight
xapp_xbiff
xapp_xcalc
xapp_xclipboard
xapp_xclock
xapp_xcmsdb
xapp_xconsole
xapp_xcursorgen
xapp_xdbedizzy
xapp_xditview
xapp_xdm
xapp_xdpyinfo	xapp_xdpyinfo: fix dependencies	2014-01-05 21:50:02 +01:00
xapp_xdriinfo
xapp_xedit
xapp_xev
xapp_xeyes
xapp_xf86dga
xapp_xfd
xapp_xfontsel
xapp_xfs
xapp_xfsinfo
xapp_xgamma
xapp_xgc
xapp_xhost
xapp_xinit
xapp_xinput
xapp_xinput-calibrator
xapp_xkbcomp
xapp_xkbevd
xapp_xkbprint
xapp_xkbutils
xapp_xkill
xapp_xload
xapp_xlogo
xapp_xlsatoms
xapp_xlsclients
xapp_xlsfonts
xapp_xmag
xapp_xman
xapp_xmessage
xapp_xmh
xapp_xmodmap
xapp_xmore
xapp_xpr
xapp_xprop
xapp_xrandr	xorg: Bump xapp_xrandr version to 1.4.1	2014-01-05 22:02:47 +01:00
xapp_xrdb
xapp_xrefresh
xapp_xset
xapp_xsetmode
xapp_xsetpointer
xapp_xsetroot
xapp_xsm
xapp_xstdcmap
xapp_xvidtune
xapp_xvinfo
xapp_xwd
xapp_xwininfo
xapp_xwud
xcb-proto	xorg: Bump xcb-proto & libxcb version to 1.10	2014-01-05 21:04:04 +01:00
xcb-util
xcb-util-image
xcb-util-keysyms
xcb-util-wm
xcursor-transparent-theme
xdata_xbitmaps
xdata_xcursor-themes
xdriver_xf86-input-evdev	udev: convert to virtual package	2014-02-12 22:14:19 +01:00
xdriver_xf86-input-joystick
xdriver_xf86-input-keyboard
xdriver_xf86-input-mouse
xdriver_xf86-input-synaptics
xdriver_xf86-input-tslib
xdriver_xf86-input-vmmouse
xdriver_xf86-input-void
xdriver_xf86-video-ark
xdriver_xf86-video-ast
xdriver_xf86-video-ati
xdriver_xf86-video-cirrus
xdriver_xf86-video-dummy
xdriver_xf86-video-fbdev
xdriver_xf86-video-geode
xdriver_xf86-video-glide
xdriver_xf86-video-glint
xdriver_xf86-video-i128
xdriver_xf86-video-intel	xorg: Bump xdriver_xf86-video-intel version to 2.99.907	2014-01-07 10:05:34 +01:00
xdriver_xf86-video-mach64
xdriver_xf86-video-mga
xdriver_xf86-video-neomagic
xdriver_xf86-video-newport
xdriver_xf86-video-nv
xdriver_xf86-video-openchrome
xdriver_xf86-video-r128
xdriver_xf86-video-savage
xdriver_xf86-video-siliconmotion
xdriver_xf86-video-sis
xdriver_xf86-video-tdfx
xdriver_xf86-video-tga
xdriver_xf86-video-trident
xdriver_xf86-video-v4l
xdriver_xf86-video-vesa
xdriver_xf86-video-vmware
xdriver_xf86-video-voodoo
xdriver_xf86-video-wsfb
xfont_encodings
xfont_font-adobe-75dpi
xfont_font-adobe-100dpi
xfont_font-adobe-utopia-75dpi
xfont_font-adobe-utopia-100dpi
xfont_font-adobe-utopia-type1
xfont_font-alias
xfont_font-arabic-misc
xfont_font-bh-75dpi
xfont_font-bh-100dpi
xfont_font-bh-lucidatypewriter-75dpi
xfont_font-bh-lucidatypewriter-100dpi
xfont_font-bh-ttf
xfont_font-bh-type1
xfont_font-bitstream-75dpi
xfont_font-bitstream-100dpi
xfont_font-bitstream-type1
xfont_font-cronyx-cyrillic
xfont_font-cursor-misc
xfont_font-daewoo-misc
xfont_font-dec-misc
xfont_font-ibm-type1
xfont_font-isas-misc
xfont_font-jis-misc
xfont_font-micro-misc
xfont_font-misc-cyrillic
xfont_font-misc-ethiopic
xfont_font-misc-meltho
xfont_font-misc-misc
xfont_font-mutt-misc
xfont_font-schumacher-misc
xfont_font-screen-cyrillic
xfont_font-sony-misc
xfont_font-sun-misc
xfont_font-util
xfont_font-winitzki-cyrillic
xfont_font-xfree86-type1
xkeyboard-config	xkeyboard-config: disable 'runtime deps as build time deps'	2014-01-06 11:29:48 +01:00
xlib_libdmx	xorg: Bump xlib_libdmx to version 1.1.3	2014-01-07 21:23:11 +01:00
xlib_libfontenc	xorg: Bump xlib_libfontenc version to 1.1.2	2014-01-05 22:19:47 +01:00
xlib_libFS	xorg: Bump xlib_libFS to version 1.0.5	2014-01-07 21:16:50 +01:00
xlib_libICE
xlib_libpciaccess	xorg: Bump xlib_libpciaccess version to 0.13.2	2014-01-05 22:20:47 +01:00
xlib_libpthread-stubs
xlib_libSM	xorg: Bump xlib_libSM version to 1.2.2	2014-01-05 22:22:52 +01:00
xlib_libX11	xorg: Bump xlib_libX11 version to 1.6.2	2014-01-05 22:25:07 +01:00
xlib_libXau	xorg: Bump xlib_libXau version to 1.0.8	2014-01-05 22:28:05 +01:00
xlib_libXaw	xorg: Bump xlib_libXaw to version 1.0.12	2014-01-07 21:17:19 +01:00
xlib_libXcomposite	xorg: Bump xlib_libXcomposite version to 0.4.4	2014-01-05 22:28:40 +01:00
xlib_libXcursor	xorg: Bump xlib_libXcursor to version 1.1.14	2014-01-07 21:17:28 +01:00
xlib_libXdamage	xorg: Bump xlib_libXdamage version to 1.1.4	2014-01-05 22:31:40 +01:00
xlib_libXdmcp
xlib_libXext	xorg: Bump xlib_libXext version to 1.3.2	2014-01-05 22:05:21 +01:00
xlib_libXfixes	xorg: Bump xlib_libXfixes version to 5.0.1	2014-01-05 22:11:57 +01:00
xlib_libXfont	xorg: Bump xlib_libXfont version to 1.4.7	2014-01-08 22:04:05 +01:00
xlib_libXft
xlib_libXi	xorg: Bump xlib_libXi version to 1.7.2	2014-01-05 22:15:48 +01:00
xlib_libXinerama	xorg: Bump xlib_libXinerama version to 1.1.3	2014-01-05 22:38:41 +01:00
xlib_libxkbfile
xlib_libXmu	xorg: Bump xlib_libXmu version to 1.1.2	2014-01-05 22:40:32 +01:00
xlib_libXpm	xorg: Bump xlib_libXpm to version 3.5.11	2014-01-07 21:17:39 +01:00
xlib_libXrandr	xorg: Bump xlib_libXrandr version to 1.4.2	2014-01-05 22:01:33 +01:00
xlib_libXrender	xorg: Bump xlib_libXrender version to 0.9.8	2014-01-05 22:44:21 +01:00
xlib_libXres	xorg: Bump xlib_libXres to version 1.0.7	2014-01-07 21:17:49 +01:00
xlib_libXScrnSaver
xlib_libXt	xorg: Bump xlib_libXt version to 1.1.4	2014-01-05 22:56:28 +01:00
xlib_libXtst	xorg: Bump xlib_libXtst version to 1.2.2	2014-01-05 22:57:16 +01:00
xlib_libXv	xorg: Bump xlib_libXv to version 1.0.10	2014-01-07 21:18:00 +01:00
xlib_libXvMC
xlib_libXxf86dga	xorg: Bump xlib_libXxf86dga to version 1.1.4	2014-01-07 21:23:05 +01:00
xlib_libXxf86vm	xorg: Bump xlib_libXxf86vm version to 1.1.3	2014-01-05 22:58:14 +01:00
xlib_xtrans	xorg: Bump xlib_xtrans version to 1.3.2	2014-01-05 22:59:47 +01:00
xproto_applewmproto
xproto_bigreqsproto
xproto_compositeproto
xproto_damageproto
xproto_dmxproto
xproto_dri2proto	xorg: Bump xproto_dri2proto version to 2.8	2014-01-05 22:17:19 +01:00
xproto_fixesproto
xproto_fontcacheproto
xproto_fontsproto
xproto_glproto	xorg: Bump xproto_glproto version to 1.4.17	2014-01-05 22:17:24 +01:00
xproto_inputproto	xorg: Bump xproto_inputproto version to 2.3	2014-01-05 22:11:57 +01:00
xproto_kbproto
xproto_presentproto
xproto_randrproto	xorg: Bump xproto_randrproto version to 1.4.0	2014-01-05 21:59:44 +01:00
xproto_recordproto
xproto_renderproto
xproto_resourceproto
xproto_scrnsaverproto
xproto_videoproto	xorg: Bump xproto_videoproto version to 2.3.2	2014-01-05 22:17:30 +01:00
xproto_windowswmproto
xproto_xcmiscproto	packages: remove support for documentation on target	2014-02-08 23:31:21 +01:00
xproto_xextproto	packages: remove support for documentation on target	2014-02-08 23:31:21 +01:00
xproto_xf86bigfontproto
xproto_xf86dgaproto
xproto_xf86driproto
xproto_xf86vidmodeproto
xproto_xineramaproto
xproto_xproto	xorg: Bump xproto_xproto version to 7.0.25	2014-01-05 22:11:57 +01:00
xserver_xorg-server	Merge branch 'next'	2014-02-28 14:30:23 +01:00
xutil_makedepend	xorg: Bump xutil_makedepend version to 1.0.5	2014-01-05 23:28:53 +01:00
xutil_util-macros	xorg: Bump xutil_util-macros version to 1.18.0	2014-01-05 23:30:21 +01:00
Config.in
x11r7.mk