[filelight/f18: 7/7] Merge branch 'master' into f18
Than Ngo
than at fedoraproject.org
Mon Mar 4 13:37:52 UTC 2013
commit fb61058d591a1b24c5ca91e321fda7b5c1d8b9ca
Merge: 1c40da0 8375dbc
Author: Than Ngo <than at redhat.com>
Date: Mon Mar 4 14:37:23 2013 +0100
Merge branch 'master' into f18
Conflicts:
.gitignore
filelight.spec
sources
.gitignore | 1 +
filelight.spec | 21 ++++++++++++++++++---
sources | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 908b209,9fa467f..a8e281c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
+/filelight-4.8.5.tar.xz
+/filelight-4.9.1.tar.xz
+/filelight-4.9.2.tar.xz
+/filelight-4.9.3.tar.xz
+/filelight-4.9.4.tar.xz
+/filelight-4.9.5.tar.xz
+ /filelight-4.10.1.tar.xz
More information about the scm-commits
mailing list