Sergii Pylypenko 91ebce1a9c Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h

2014-06-04 17:09:23 +03:00

6.7 KiB

Raw Blame History

View Raw