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

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