]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
projects / coffee / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c1fc16 74ecbaa)
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 25 Jul 2009 07:13:44 +0000 (09:13 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 25 Jul 2009 07:13:44 +0000 (09:13 +0200)
1  2 
package/Config.in patch | diff1 | diff2 | blob | history
package/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc package/Config.in
Simple merge
diff --cc package/Makefile.in
Simple merge