commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb | [log] [tgz] |
---|---|---|
author | Peter Korsgaard <peter@korsgaard.com> | Mon Dec 01 11:15:54 2014 +0100 |
committer | Peter Korsgaard <peter@korsgaard.com> | Mon Dec 01 11:16:42 2014 +0100 |
tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c | |
parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 [diff] | |
parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f [diff] |
Merge branch 'next' Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard <peter@korsgaard.com>