[python-keyring/f20: 2/2] Merge branch 'master' into f20

Christopher Meng cicku at fedoraproject.org
Thu Feb 13 03:18:42 UTC 2014


commit a08d2614d4266cf095a9a1c7940ad1139dfda07b
Merge: daac798 7ecd9f7
Author: Christopher Meng <i at cicku.me>
Date:   Thu Feb 13 11:18:56 2014 +0800

    Merge branch 'master' into f20

 .gitignore          |    1 +
 python-keyring.spec |   25 +++++++++++++------------
 sources             |    2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 4a9eb45,8804454..bc4488c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,2 @@@
 -/keyring-0.4.tar.gz
 -/keyring-0.5.1.tar.gz
 -/keyring-0.7.zip
 -/keyring-3.1.zip
  /keyring-3.3.zip
+ /keyring-3.4.zip


More information about the scm-commits mailing list