jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
Cockatrice/servatrice
History
woogerboy21 021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server 
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
2014-07-18 23:46:56 -04:00
..
scripts Example Update 2014-07-02 13:23:50 -04:00
src Merge remote-tracking branch 'upstream/master' into registered-user-only-server 2014-07-18 23:46:56 -04:00
CMakeLists.txt Cmake reorganization 2014-06-28 19:39:26 +02:00
servatrice.ini.example Requested Cleanup 2014-07-02 22:27:05 -04:00
servatrice.sql changed users table in servatrice.sql 2013-02-11 14:40:32 +01:00