projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f44f0aa 18546c2)
Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 6 Mar 2010 08:35:46 +0000 (09:35 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 6 Mar 2010 08:35:46 +0000 (09:35 +0100)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history
automake.in patch | diff1 | diff2 | blob | history
lib/Automake/Options.pm patch | diff1 | diff2 | blob | history
lib/Automake/Variable.pm patch | diff1 | diff2 | blob | history
lib/Automake/XFile.pm patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc automake.in
index c0bf146,503c221..d5e3ec2
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc lib/Automake/Options.pm
Simple merge
diff --cc lib/Automake/Variable.pm
Simple merge
diff --cc lib/Automake/XFile.pm
Simple merge
Domain: System / Base;