commit 475954501f68e46fb037345cef4589cf5054b041
Merge: baccb6a 2419a4d
Author: Jan-Frode Myklebust <janfrode(a)tanso.net>
Date: Fri Apr 1 10:45:52 2011 +0200
Merge branch 'f15' into el6
Conflicts:
.gitignore
maatkit.spec
sources
.gitignore | 5 ++++-
maatkit.spec | 25 +++++++++++++++++--------
sources | 2 +-
3 files changed, 22 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 6ab8bc7,dbb3b1c..fd9981b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,4 @@@
--maatkit-6457.tar.gz
++/maatkit-6457.tar.gz
+ /maatkit-6839.tar.gz
+ /maatkit-7284.tar.gz
+ /maatkit-7332.tar.gz