Merge git+ssh://johnfredcee@repo.or.cz/srv/git/trivial-gtk
commitf769a5aec81600bacc470840182b87d444320507
authorJohn Connors <johnc@yagc.ndo.co.uk>
Thu, 12 Jun 2008 00:17:45 +0000 (12 01:17 +0100)
committerJohn Connors <johnc@yagc.ndo.co.uk>
Thu, 12 Jun 2008 00:17:45 +0000 (12 01:17 +0100)
treeb9a45bdfd5e90bfbd5b9de88b7fe026d50ca7856
parent6903ac4de03e8d198f7c66d3b1bf8982622eac71
parenta5f12222d0a561f167b07748354590fb670dbbe7
Merge git+ssh://johnfredcee@repo.or.cz/srv/git/trivial-gtk

Conflicts:

gir-loader.lisp
gir-loader.lisp
gir-parser.lisp
gir-tester.lisp