[kaccessible/f18: 7/7] Merge branch 'master' into f18
Than Ngo
than at fedoraproject.org
Mon Mar 4 14:23:23 UTC 2013
commit 4362ed9788d29e79b93628474e1ae44919efd240
Merge: 1d710c6 6ebb5af
Author: Than Ngo <than at redhat.com>
Date: Mon Mar 4 15:22:53 2013 +0100
Merge branch 'master' into f18
Conflicts:
.gitignore
kaccessible.spec
sources
.gitignore | 1 +
kaccessible.spec | 21 ++++++++++++++++++---
sources | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3538659,4d9af79..c4b48fb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
+/kaccessible-4.8.5.tar.xz
+/kaccessible-4.9.1.tar.xz
+/kaccessible-4.9.2.tar.xz
+/kaccessible-4.9.3.tar.xz
+/kaccessible-4.9.4.tar.xz
+/kaccessible-4.9.5.tar.xz
+ /kaccessible-4.10.1.tar.xz
More information about the scm-commits
mailing list