[gtk-nodoka-engine: 9/10] Merge branch 'f12' into f13
Martin Sourada
mso at fedoraproject.org
Mon Aug 23 14:44:27 UTC 2010
commit c35d65585334a86081d7237eb1f762265f0e3a60
Merge: 81bd376 551e422
Author: Martin Sourada <mso at fedoraproject.org>
Date: Mon Aug 23 16:41:07 2010 +0200
Merge branch 'f12' into f13
Conflicts:
.gitignore
gtk-nodoka-engine.spec
.gitignore | 1 +
gtk-nodoka-engine-0.7.2-grey-out-checkboxes.patch | 21 --
...ka-engine-0.7.2-honor-transparent-bg-hint.patch | 158 ----------
gtk-nodoka-engine-0.7.2-missing-widget-check.patch | 15 -
gtk-nodoka-engine-handle-selection.patch | 19 --
gtk-nodoka-engine-leak.patch | 13 -
gtk-nodoka-engine-scale-trough.patch | 327 --------------------
gtk-nodoka-engine.spec | 50 ++--
sources | 2 +-
9 files changed, 30 insertions(+), 576 deletions(-)
---
More information about the scm-commits
mailing list