mireado d639972d57 Merge remote-tracking branch 'refs/remotes/origin/master' into pr/14 ... # Conflicts: # gui/command.cpp # gui/language.cpp		2017-01-29 03:08:13 +09:00
..
gui_korean	Merge remote-tracking branch 'refs/remotes/origin/master' into pr/14	2017-01-29 03:08:13 +09:00