[celestia/el6: 24/24] fixed conflict

[Matías Kreder]

commit cc4abfb16d6b4211a64886ead5fc05aa9cc2fade
Merge: 31f4797 5833f82
Author: Matias Kreder <mkreder at gmail.com>
Date:   Sun Nov 16 16:56:01 2014 -0300

    fixed conflict

 .gitignore                   |    2 +-
 celestia-1.5.0-gcc44.patch   |   26 -
 celestia-1.5.1-gcc43.patch   | 1201 --------------
 celestia-1.6.1-gcc47.patch   |   22 +
 celestia-1.6.1-gcc48.patch   |   36 +
 celestia-1.6.1-lua-5.2.patch | 3639 ++++++++++++++++++++++++++++++++++++++++++
 celestia-1.6.1-zlib.patch    |   12 +
 celestia-lua-52-fix.patch    |   16 +
 celestia.desktop             |    2 +-
 celestia.spec                |  166 ++-
 sources                      |    2 +-
 11 files changed, 3857 insertions(+), 1267 deletions(-)
---
diff --cc .gitignore
index bfab8b9,458cac7..11b4f36
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,1 @@@
--celestia-1.5.1.tar.gz
 -/celestia-1.6.0.tar.gz
 -/celestia-1.6.1.tar.gz
 -/celestia-1.6.1-clean.tar.gz
 -/celestia-1.6.1-clean.tar.xz
++celestia-1.5.1.tar.xz