Merge branch 'master' into gtk3
authorMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 16:13:59 +0000 (18:13 +0200)
committerMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 16:13:59 +0000 (18:13 +0200)
commit2b44d8d468ed734afd0bed5b3577c871782eb00d
treeaf1fe78adf33a05438f56d7eb694d2ad97f990b5
parentdc9213af8972055ee54bdee4cced6103e1432010
parent343e89354b4e079c244867c4b7a5a058a95ca116
Merge branch 'master' into gtk3
libchimara/style.c