[OmegaT/f21: 3/3] Merge branch '2.6.3-tmp' into f21

[Ismael Olea]

commit bea1c41da5376cc264042a00eb728c7a7876a497
Merge: 7dfb668 37a54d4
Author: Ismael Olea <ismael at olea.org>
Date:   Thu Aug 21 23:46:12 2014 +0200

    Merge branch '2.6.3-tmp' into f21
    
    Conflicts:
    	OmegaT.spec

 OmegaT-build.xml |    2 ++
 OmegaT.spec      |   44 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)
---
diff --cc OmegaT.spec
index f296656,81039ee..893a589
--- a/OmegaT.spec
+++ b/OmegaT.spec
@@@ -217,13 -232,14 +232,20 @@@ dos2unix -k -f release/*.tx
  
  
  %changelog
+ * Fri Aug 15 2014 Ismael Olea <ismael at olea.org> - 2.6.3-2
+ - added to jpackage_script missing deps to jsap and java-gnudiff
+ 
+ * Thu Aug 7 2014 Ismael Olea <ismael at olea.org> - 2.6.3-1
+ - Update to 2.6.3
+ - Added OmegaT-08-unmappable-character-errors.patch since OpenJDK seems not to like some non ASCII characters
+   This patch doesn't affect any real code but it's needed to compile.
  
 +* Sun Aug 17 2014 Ismael Olea <ismael at olea.org> - 2.6.1-0.14.Beta
 +- fixing #1105917
 +
 +* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-0.13.Beta
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
  * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-0.12.Beta
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild