5 Commits

Author	SHA1	Message	Date
Calvin Montgomery	6046ea2480	Fix the wrong files being merged	2014-05-20 20:11:40 -07:00
calzoneman	64980bc293	Add warning as discussed in #347	2014-04-13 02:14:34 -05:00
calzoneman	ed65f3a648	Fix #333	2014-03-19 22:17:57 -05:00
calzoneman	3da717adb9	Fixes	2014-02-28 00:09:20 -06:00
calzoneman	644437ea42	Directory cleanup	2014-02-18 22:00:56 -06:00