[eclipse-shelled/f17: 2/2] Merge branch 'master' into f17
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jul 18 14:49:26 UTC 2012
commit a1b3fd78a3fc405fa00255533cf6d5a464ccf808
Merge: 8599c95 807ebf0
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jul 18 17:49:09 2012 +0300
Merge branch 'master' into f17
Conflicts:
.gitignore
.gitignore | 1 +
eclipse-shelled.spec | 9 +++++++--
fetchSources.sh | 16 ----------------
sources | 2 +-
4 files changed, 9 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index 01da129,a3bb36a..4742ed2
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,4 +3,5 @@@ shelled-2.0.0-src.tar.bz
shelled-2.0.1-src.tar.bz2
/shelled-2.0.2-src.tar.bz2
shelled-2.0.2-src-r133.tar.bz2
+ shelled-2.0.2-src.tar.bz2
+
More information about the scm-commits
mailing list