7 commits

Author	SHA1	Message	Date
Nick Bolton	728e8bb035	merge 1.3 r843:844 into trunk	2011-01-17 00:41:14 +00:00
Nick Bolton	516c07c956	changed synergy+ references back to synergy (trunk)	2011-01-15 04:01:31 +00:00
Nick Bolton	f4d937532e	normalised line endings - replaced \r\n with \n	2011-01-15 02:20:14 +00:00
Nick Bolton	8635348093	Fixed issue 154	2010-06-20 17:38:51 +00:00
Nick Bolton	8ee25ea2ce	Merge 1.4.1 r603:604 into trunk	2010-06-13 00:06:11 +00:00
Nick Bolton	87349de8e3	Fixed build error caused by last commit (tested on Linux)	2010-06-05 19:25:23 +00:00
Nick Bolton	f974d8d680	Some work toward Issue 27 and Issue 319	2010-05-31 21:30:29 +00:00