[python-polib/el6: 7/7] Merge branch 'master' into el6
Ding-Yi Chen
dchen at fedoraproject.org
Fri Oct 28 06:59:52 UTC 2011
commit e9f3c1552b9b41f3b16b2f8bbb3ca16429b94c5a
Merge: 50e38bc 561737c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: Fri Oct 28 16:59:41 2011 +1000
Merge branch 'master' into el6
Conflicts:
.gitignore
python-polib.spec
sources
.gitignore | 1 +
python-polib.spec | 78 ++++++++++++++++++++++++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 73 insertions(+), 8 deletions(-)
---
More information about the scm-commits
mailing list