projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70874e3 aa01679)
Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Tue, 1 Sep 2015 07:59:08 +0000 (09:59 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 1 Sep 2015 07:59:08 +0000 (09:59 +0200)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
1  2 
package/Config.in patch | diff1 | diff2 | blob | history
package/libpfm4/libpfm4.mk patch | diff1 | diff2 | blob | history
package/mesa3d/mesa3d.mk patch | diff1 | diff2 | blob | history
package/msmtp/msmtp.mk patch | diff1 | diff2 | blob | history
package/squid/squid.mk patch | diff1 | diff2 | blob | history

diff --cc package/Config.in
Simple merge
diff --cc package/libpfm4/libpfm4.mk
Simple merge
diff --cc package/mesa3d/mesa3d.mk
Simple merge
diff --cc package/msmtp/msmtp.mk
Simple merge
diff --cc package/squid/squid.mk
Simple merge