2 Commits (36d2be14a89396db34e7d15e715aa086216c751b)

Author	SHA1	Message	Date
Allen Webster	8c8dc50935	fixed scratch constructor problem; fixed file conflict resolution crash	2019-10-05 13:28:08 -07:00
Allen Webster	87ba9e747c	Starting to reorganize build scripts	2019-10-01 14:07:39 -07:00