Skip to content
Commit fe1b2ef1 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 



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

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 9a5434fb 9b47f40b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment