Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Mon, 24 Sep 2012 09:37:17 +0000 (11:37 +0200)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Mon, 24 Sep 2012 09:37:17 +0000 (11:37 +0200)
commit0b4fd82c4380dfdbd8e4bd37e1b4aa9907a1b187
treea598c506662b3ff7bab28689cb3ff5134bd104e4
parent61c8977d3b757bbe8ebdfe9e2241a085a8991d01
parentf77f0bcda8bdc69bc5d42992fc4d463e0e72840c
Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3