10 Commits

Include renames

Author	SHA1	Message	Date
KimLS	8b08f19628	Merge branch 'master' into DBQuery	2014-08-16 14:12:33 -07:00
Michael Cook (mackal)	8940e987c1	Fix some compiler warnings	2014-08-10 15:56:58 -04:00
Arthur Ice	0f6ce6a1f4	Upstream merge	2014-07-30 14:46:02 -07:00
KimLS	b7e36feeeb	Removed more socket server stuff, changed some of the build stuff.	2014-07-14 15:44:28 -07:00
Arthur Ice	6a59b83d43	StringFormat converted to move semantics	2014-07-08 21:09:55 -07:00
Corysia Taware	f6046477b4	Changes for intel Mac OSX build	2014-04-03 14:10:03 -07:00
Michael Cook (mackal)	5a6f2467f8	Added fclose to ExportBaseData	2014-01-12 00:58:47 -05:00
KimLS	0e6c9820cd	Importing client files works now	2013-11-06 13:17:44 -08:00
KimLS	ec6c5519a5	More work on importing... I need my escape stuff from other branch for this though	2013-10-21 16:41:34 -07:00
KimLS	f2f4e55818	Import/Export util start	2013-10-18 21:23:45 -07:00