Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
authorMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 23:05:44 +0000 (01:05 +0200)
committerMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 23:05:44 +0000 (01:05 +0200)
commitbb6ef9669d8f9ba58c52e1cadae9b7b303d5bc70
tree65dc1ec0cdc993e313a27983462b477e67c76fde
parentf17f704eb40ce5d3d6ec7f2daf2d67586225ff90
parent77fe88af15dc59b5595822f70d75082f1ccd34a4
Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
libchimara/resource.c