[ktp-text-ui/f18: 9/9] Merge branch f19 into f18

Jan Grulich jgrulich at fedoraproject.org
Tue Apr 2 10:35:17 UTC 2013


commit b4c4452e220a9b761593e8e816f3fc26e9d675f1
Merge: 3ed187e d32b71b
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Tue Apr 2 12:35:02 2013 +0200

    Merge branch f19 into f18

 .gitignore       |    2 ++
 ktp-text-ui.spec |   34 ++++++++++++++++++++--------------
 sources          |    2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index 081594a,6f059a6..aa60db8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,2 +1,7 @@@
 +/ktp-text-ui-0.4.1.tar.bz2
 +/ktp-text-ui-0.5.0.tar.bz2
 +/ktp-text-ui-0.5.1.tar.bz2
 +/ktp-text-ui-0.5.2.tar.bz2
 +/ktp-text-ui-0.5.3.tar.bz2
+ /ktp-text-ui-0.5.80.tar.bz2
+ /ktp-text-ui-0.6.0.tar.bz2


More information about the scm-commits mailing list