Merge remote-tracking branch 'upstream/master'

Browse Source

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

...

This commit is contained in:

Sergii Pylypenko

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

parent 19472fd0d2 bb3544e086

commit 91ebce1a9c

550 changed files with 7396 additions and 6552 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1468

src/settings_gui.cpp

File diff suppressed because it is too large Load Diff