projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcad1df bf38d9c)
Merge branch 'maint' into foo
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history
automake.in patch | diff1 | diff2 | blob | history
doc/automake.texi patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc automake.in
index 4a753db,b3a2cae..e8a9727
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc doc/automake.texi
Simple merge
Domain: System / Base;