Akkadius
|
240b066f34
|
post merge fixing
|
2014-12-16 00:29:38 -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
|
bbea7f4f53
|
eqemu_config.cpp & .h header cleanup, code style cleanup of eqemu_config.h
|
2014-12-15 21:01:52 -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
|
7fc21b9e3a
|
Tons of renames
|
2014-08-21 19:33:02 -07:00 |
|
KimLS
|
06f18225ce
|
Renaming headers is hard work
|
2014-08-21 17:26:32 -07:00 |
|