Commit 8aeef35a authored by nanahira's avatar nanahira

merge

parents 46add299 a63e6974
...@@ -8,8 +8,8 @@ errorlog = 3 ...@@ -8,8 +8,8 @@ errorlog = 3
nickname = Komeiji Koishi nickname = Komeiji Koishi
gamename = Game gamename = Game
lastdeck = new lastdeck = new
textfont = c:/windows/fonts/simhei.ttf 14 textfont = ./fonts/simhei.ttf 14
numfont = c:/windows/fonts/arial.ttf numfont = ./fonts/arial.ttf
serverport = 7911 serverport = 7911
lasthost = 127.0.0.1 lasthost = 127.0.0.1
lastport = 7911 lastport = 7911
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment