Merge git+ssh://johnfredcee@repo.or.cz/srv/git/trivial-gtk
commit265f4d729d1acb18217cf620c333e11eb43f15d1
authorJohn Connors <johnc@yagc.ndo.co.uk>
Fri, 6 Jun 2008 05:59:22 +0000 (6 06:59 +0100)
committerJohn Connors <johnc@yagc.ndo.co.uk>
Fri, 6 Jun 2008 05:59:22 +0000 (6 06:59 +0100)
treec24b1b97a266fe06e37064e52eda6649064d555e
parent831b0dce198a6f514ea94b7073c9930d7464cf9e
parent8be7ad7ddad8d9ec733934457eeb26ba254caa00
Merge git+ssh://johnfredcee@repo.or.cz/srv/git/trivial-gtk

Conflicts:

gir.lisp