projects / projects / chimara / chimara.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f17f704 77fe88a)
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)
1  2 
libchimara/resource.c patch | diff1 | diff2 | blob | history

diff --cc libchimara/resource.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.