Initial GUI for combining TMXs
Fix spurious exceptions relating to ProgressWindow
Implement rest of combine GUI
Implement combining
Fix writing of TMX files to not wrongly indent <seg> with complex content
Make combining invokable by command line
Update readme
Fix typo
Add note about character diff highlighting
Move to Java 1.7
Make write failure exception less broad
Always marshal with UTF-8
Move diff-related TMX props definitions to DiffUtil
Fix NullPointerException when diffing TU with no target TUV
Change key creation for TUs with no source TUV to be consistent across runs
Fix duplicate TUs in merge output
Flesh out unit tests
Catch less broad exception
Cleanup
Make progress window start counting earlier