[OmegaT/f14/master] - updated to 2.2.3_Beta - fixed hunspell integration - swing-worker patch

[Ismael Olea]

commit e8fda52d18da7361ba4cea77ba5a1a20021e6941
Author: Ismael Olea <ismael at olea.org>
Date:   Thu Dec 30 16:57:51 2010 +0100

    - updated to 2.2.3_Beta
    - fixed hunspell integration
    - swing-worker patch

 .gitignore |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f70fe7..131bcf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 OmegaT_1.7.3_04_Source.zip
 OmegaT_2.0.5_04_Source.zip
-<<<<<<< HEAD
 clog
-=======
->>>>>>> master
 /OmegaT_2.2.3_Beta_Source.zip
+*zip
+*~