8 Commits

Author	SHA1	Message	Date
Alex	2e462e04d5	Resolve conflicts ... All "confilcts" were actually diffs - not sure why git flew off the handle.	2013-01-12 14:27:50 -06:00
Alex	2e69817ccf	merge develop into master	2013-01-10 23:55:10 -06:00
Guenter Obiltschnig	2ddd48304d	fixed text files	2012-11-11 13:56:24 +01:00
aleks-f	67a27ac2fa	StringTokenizer trailing empty tokens consistency ... Modified StringTokenizer to eith include or exclude all empty tokens (including trailing ones based on TOK_IGNORE_EMPTY option.	2012-11-07 00:30:01 -06:00
Aleksandar Fabijanic	47aadf0681	- SF# 3559325: Util Windows broken in non-Unicode ... - port of rev. 1918 from 1.4.4 branch (fixed SF# 3519474) - update VS 2010 Util projects with JSON	2012-08-19 01:42:38 +00:00
Aleksandar Fabijanic	14f6c10534	update JSON VS 2008 solution	2012-07-13 01:09:08 +00:00
Aleksandar Fabijanic	6013d9ddfa	fixed project GUIDs (did not help ProGen)	2012-05-15 02:33:07 +00:00
Aleksandar Fabijanic	3a46515ded	JSON VS 2010 build (library and tests)	2012-05-15 01:54:26 +00:00