projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea1a417 9e126f1)
Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history
NEWS patch | diff1 | diff2 | blob | history
automake.in patch | diff1 | diff2 | blob | history
lib/Automake/tests/Makefile.in patch | diff1 | diff2 | blob | history
tests/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc automake.in
index 3897de4,6b36ae2..9cbe6c1
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc lib/Automake/tests/Makefile.in
Simple merge
diff --cc tests/Makefile.in
Simple merge
Domain: System / Base;