projects / mathgl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 417f8a2 2bb536d)
Merge commit 'upstream/1.11.2'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jun 2011 13:39:20 +0000 (16:39 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jun 2011 13:39:20 +0000 (16:39 +0300)
Conflicts:
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/requests
autom4te.cache/traces.0
autom4te.cache/traces.1

1  2 
texinfo/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc texinfo/Makefile.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.