Richard Cordovano b1d27128fb Merge in develop and resolve conflicts

2015-08-28 13:00:50 -04:00

..

build-impl.xml

Move Logger and AutopsyPropFile into new module, CoreUtils

2012-01-06 16:29:42 -05:00

genfiles.properties

Saving before merge attempt

2014-02-19 13:11:01 -05:00

platform.properties

upgrade sqlite to 3.8 and change url to updates.netbeans

2015-08-26 14:46:47 -04:00

platform.xml

Saving before merge attempt

2014-02-19 13:11:01 -05:00

project.properties

turn on IG

2015-08-28 10:07:02 -04:00

project.xml

Initial import into github

2011-11-09 13:10:50 -05:00