projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd7ff42 7d836cd)
Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11
authorPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 12:04:13 +0000 (13:04 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 12:04:13 +0000 (13:04 +0100)
* fix-vala-test-for-branch-1.11:
  tests: fix (harmless) botched merge

1  2 
tests/vala.test patch | diff1 | diff2 | blob | history

diff --cc tests/vala.test
Simple merge
Domain: System / Base;