[OmegaT/f14/master: 8/8] * Wed Aug 11 2010 Ismael Olea <ismael at olea.org> 2.0.5_04-1 - updating to 2.0.5_04 - removing referen

[Ismael Olea]

commit a91a9ad1c637f87c2af57a5f29d0fd72a98a9a48
Merge: 96301be 7fd8db6
Author: Ismael Olea <ismael at olea.org>
Date:   Wed Aug 25 13:47:09 2010 +0200

    * Wed Aug 11 2010 Ismael Olea <ismael at olea.org> 2.0.5_04-1
    - updating to 2.0.5_04
    - removing references to javadoc generation
    - removing support for jmyspell (from Tiago's OmegaT-05-remove-jmyspell-alternative.patch)
    - using local hunspell (from Tiago's OmegaT-06-use-external-hunspell.patch )
    - spec cleaning
    * Wed Aug 11 2010 Ismael Olea <ismael at olea.org> 2.0.5_04-1
    - updating to 2.0.5_04
    - removing references to javadoc generation
    - removing support for jmyspell (from Tiago's OmegaT-05-remove-jmyspell-alternative.patch)
    - using local hunspell (from Tiago's OmegaT-06-use-external-hunspell.patch )
    - spec cleaning

 .gitignore                                  |    5 +-
 OmegaT-04-get-rid-of-MRJAdapter.patch       |   67 +++++---------
 OmegaT-05-remove-jmyspell-alternative.patch |   72 ++++++++++++++++
 OmegaT-06-use-external-hunspell.patch       |   43 +++++++++
 OmegaT-ant.properties                       |    9 --
 OmegaT-build.xml                            |    9 ++
 OmegaT-extra-jars-in-new-location.patch     |   14 ---
 OmegaT-help-path.patch                      |   25 ++++++
 OmegaT-manifes-template.patch               |    9 --
 OmegaT.sh                                   |   13 +++
 OmegaT.spec                                 |  124 ++++++++++++++++-----------
 sources                                     |    2 +-
 12 files changed, 263 insertions(+), 129 deletions(-)
---
diff --cc .gitignore
index 39e7629,9c66509..d18cfc3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,2 +1,6 @@@
  OmegaT_1.7.3_04_Source.zip
  OmegaT_2.0.5_04_Source.zip
- clog
++<<<<<<< HEAD
++clog
++=======
++>>>>>>> master