| commit | 14c979fac929ade49d5ed2c5f62cdfc54669d183 | |
| author | John Connors <johnc@yagc.ndo.co.uk> | |
| Thu, 12 Jun 2008 21:51:47 +0000 (12 22:51 +0100) | ||
| committer | John Connors <johnc@yagc.ndo.co.uk> | |
| Thu, 12 Jun 2008 21:51:47 +0000 (12 22:51 +0100) | ||
| tree | d30b309083434678cedda53a71c394f49327bb3e | treesnapshot (tar.gz zip) |
| parent | f1e75802919c0bd7135ebebe01a24383ad57fdeb | commitdiff |
| parent | 19632f1fcb165bdc2f6fe6519dbff27907bba006 | commitdiff |
Merge branch 'master' of git://repo.or.cz/trivial-gtk
Conflicts:
gir-repository/gir/Makefile.am
Conflicts:
gir-repository/gir/Makefile.am