Arthur Ice
|
fca9c1458b
|
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
common/debug.cpp
common/debug.h
zone/PlayerCorpse.cpp
zone/beacon.cpp
zone/client.cpp
zone/net.cpp
zone/tribute.cpp
|
2013-05-19 16:19:22 -07:00 |
|
j883376
|
4bdd8b2502
|
Change space indentation to tabs
|
2013-05-09 11:37:51 -04:00 |
|
j883376
|
ffcff4aea1
|
Remove trailing whitespace
|
2013-05-09 11:13:16 -04:00 |
|
Arthur Ice
|
23c524812d
|
Removed the _MSC_VER special cases for Visual Studio 2008 and lower.
We no longer support 2008 and lower so these defines will never be used.
|
2013-05-08 17:09:13 -07:00 |
|
Arthur Ice
|
7560b6b0a7
|
NULL to nullptr
|
2013-05-04 18:06:58 -07:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|