[libmx: 8/8] fix merge

[Peter Robinson]

commit 867f40f681b156890f8ff40b71c86065e1f66a69
Merge: bfca3b8 5c45202
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 9 15:07:20 2011 +0100

    fix merge

 .gitignore                                |   12 +---
 0001-GAction-API-changed-in-2.29.90.patch |   28 ++++++++
 libmx.spec                                |   99 +++++++++++++++-------------
 sources                                   |    2 +-
 4 files changed, 83 insertions(+), 58 deletions(-)
---
diff --cc .gitignore
index 594c715,d05517f..068394b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,12 +1,1 @@@
--mx-1.0.3.tar.bz2
--mx-1.1.0.tar.bz2
--/mx-1.1.4.tar.bz2
--/mx-1.1.6.tar.bz2
--/mx-1.1.7.tar.bz2
--/mx-1.1.9.tar.bz2
--/mx-1.1.10.tar.bz2
--/mx-1.1.11.tar.bz2
--/mx-1.1.12.tar.bz2
--/mx-1.2.0.tar.bz2
- /mx-1.3.0.tar.xz
 -/mx-1.3.1.tar.xz
 -/mx-1.3.2.tar.xz
++/mx-1.*.tar.xz