File	Date	Author	Commit
src	2014-05-22	Adam Bolding-Jones	[7225ea] Added Dynamsoft logo
.classpath	2014-01-02	yushulx	[c3c2d9] init
.project	2014-01-02	yushulx	[c3c2d9] init
README.txt	2014-05-22	Adam Bolding-Jones	[577813] update readme

Read Me

MergeHero: Differing and Merging Folders & Files
================================================
Version: 1.0.1

Features:
- compare folders
- differ files (text files only)
- merge files (text files only)

How to run application:
- Main class: MergeHero.MergeHeroApp

MergeHero is licensed as GPLv3 software.
This project is hosted on https://sourceforge.net/projects/mergehero

Contact Dynamsoft for more info: http://www.dynamsoft.com/Company/Contact.aspx



Changelog
================================================

Version 1.0.1

Updated the "About" dialog: fixed the hyperlink, added a Dynamsoft logo and changed the
dialog box style.