]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
projects / coffee / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d487168 97d8618)
Merge branch 'for-2010.11/remove-deprecated-arch' of git://git.busybox.net/~tpetazzon...
authorPeter Korsgaard <jacmet@sunsite.dk>
Thu, 30 Sep 2010 12:41:38 +0000 (14:41 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 30 Sep 2010 12:41:38 +0000 (14:41 +0200)
1  2 
fs/jffs2/Config.in patch | diff1 | diff2 | blob | history
package/liboil/liboil.mk patch | diff1 | diff2 | blob | history
target/Config.in.arch patch | diff1 | diff2 | blob | history

diff --cc fs/jffs2/Config.in
Simple merge
diff --cc package/liboil/liboil.mk
Simple merge
diff --cc target/Config.in.arch
Simple merge