Matt Nadareski bce1cc5839 Add stage 1 changes for better merging ...

The new merging process is both parse and merge in one step using an in-memory database. The next steps are to get the data in this database and write it out properly.

2016-04-27 00:53:15 -07:00

..

Properties

Initial commit of mostly working desktop portT

2016-03-18 01:17:39 -07:00

App.config

Let's be Mono friendly

2016-04-20 17:02:15 -07:00

DATabase.cs

Wrong name on menu

2016-04-22 15:17:43 -07:00

DATabase.csproj

Merge MergeDAT, part 6

2016-04-21 14:12:01 -07:00

ExtSplit.cs

Merge DatSplit, part 4

2016-04-20 11:37:20 -07:00

Generate.cs

Test and fix commented code. It works now!

2016-04-22 12:15:19 -07:00

Import.cs

Add markers for testing

2016-04-22 11:08:02 -07:00

MergeDiff.cs

Add stage 1 changes for better merging

2016-04-27 00:53:15 -07:00

packages.config

Let's be Mono friendly

2016-04-20 17:02:15 -07:00

TrimMerge.cs

Change wording and default

2016-04-21 15:24:31 -07:00