Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

2026-09-04 22:56:37 +00:00 · 2020-04-06 02:55:46 -05:00
parent b23bc83f0f 6f846dc4ff
commit 2b1b786f02
34 changed files with 1497 additions and 144 deletions
@@ -78,6 +78,7 @@ SET(common_sources
 	unix.cpp
 	platform.cpp
 	json/jsoncpp.cpp
+	namegenerator/namegen.cpp
 	net/console_server.cpp
 	net/console_server_connection.cpp
 	net/crc32.cpp
@@ -562,6 +563,7 @@ SET(common_headers
 	event/timer.h
 	json/json.h
 	json/json-forwards.h
+	namegenerator/namegen.h
 	net/console_server.h
 	net/console_server_connection.h
 	net/crc32.h