]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
Merge branch 'for-2010.11/kconfig-upgrade' of git://git.busybox.net/~tpetazzoni/git...
authorPeter Korsgaard <jacmet@sunsite.dk>
Thu, 2 Sep 2010 15:08:11 +0000 (17:08 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 2 Sep 2010 15:08:11 +0000 (17:08 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge