Akkadius
|
dd6d1d5511
|
Merge remote-tracking branch 'remotes/origin/master' into web_interface
Conflicts:
CMakeLists.txt
common/logtypes.h
common/shareddb.cpp
world/net.cpp
zone/client_logs.cpp
zone/corpse.cpp
zone/mob.cpp
zone/net.cpp
|
2015-02-02 23:11:31 -06:00 |
|
KimLS
|
f388a605dd
|
Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash
|
2015-01-30 15:03:02 -08:00 |
|
Akkadius
|
0d9b6703a6
|
Rename debug.h to global_define.h, update cmakelists and such
|
2015-01-19 04:12:09 -06:00 |
|
Akkadius
|
fffe59c52e
|
Merge remote-tracking branch 'remotes/origin/master' into web_interface
Conflicts:
common/CMakeLists.txt
common/eqemu_config.cpp
common/eqemu_config.h
common/shareddb.h
|
2014-12-16 00:12:01 -06:00 |
|
Akkadius
|
677c6b5750
|
emu_tcp_connection.cpp & .h include header cleanup and forward declare
|
2014-12-15 20:21:54 -06:00 |
|
KimLS
|
29b4498534
|
Hopefully completely merged from master in what is the biggest merge ever
|
2014-12-07 13:23:16 -08:00 |
|
KimLS
|
06f18225ce
|
Renaming headers is hard work
|
2014-08-21 17:26:32 -07:00 |
|
KimLS
|
6457c00548
|
Renaming files
|
2014-08-21 16:44:02 -07:00 |
|