filux 9988ea9cbf resolved conflicts to upstream/develop		2014-09-27 11:19:29 +00:00
..
cmake/Modules	- added cmake compile warning when users uses clang as clang currently does NOT support some critical GCC settings we require.	2014-02-06 19:14:14 -08:00
fedora	Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files.	2014-01-25 21:52:02 +01:00
linux	resolved conflicts to upstream/develop	2014-09-27 11:19:29 +00:00
macosx	- fix for Mac OsX	2013-01-07 02:54:02 +00:00
shared	Update server list	2014-02-02 22:35:50 +01:00
windoze	resolved conflicts to upstream/develop	2014-09-27 11:19:29 +00:00