akkadius 54c89d69f6 Merge remote-tracking branch 'remotes/origin/master' into blob_conversion ...

Conflicts:
	common/database.cpp
	common/mysql_request_result.h
	common/shareddb.cpp

2014-09-07 04:11:09 -05:00

..

chatchannel.cpp

Tons of renames

2014-08-21 19:33:02 -07:00

chatchannel.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

clientlist.cpp

Tons of renames

2014-08-21 19:33:02 -07:00

clientlist.h

Tons of renames

2014-08-21 19:33:02 -07:00

CMakeLists.txt

Removed more socket server stuff, changed some of the build stuff.

2014-07-14 15:44:28 -07:00

database.cpp

Merge remote-tracking branch 'remotes/origin/master' into blob_conversion

2014-09-07 04:11:09 -05:00

database.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

ucs.cpp

Tons of renames

2014-08-21 19:33:02 -07:00

ucsconfig.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

ucsconfig.h

Renaming headers is hard work

2014-08-21 17:26:32 -07:00

worldserver.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

worldserver.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00