Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Mon, 1 Dec 2014 10:15:54 +0000 (11:15 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 1 Dec 2014 10:16:42 +0000 (11:16 +0100)
commitfe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb
treefd6edbe93b19b167b105897e3de6a7c11eac4f9c
parent9a5434fbfc98a0c427c880b167b8ca3499b44e87
parent9b47f40bb29d9be34afabfb423bab0ad45cbc11f
Merge branch 'next'

Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Makefile
package/btrfs-progs/btrfs-progs.mk
package/grantlee/Config.in
package/omniorb/omniorb.mk
package/shairport-sync/shairport-sync.mk
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk