Merge branch 'master' into perPlayerDifficulties

Browse Source

Conflicts:
	src/guiengine/widget.hpp
	src/guiengine/widgets/progress_bar_widget.cpp

...

This commit is contained in:

Flakebi

2014-10-20 22:27:34 +02:00

parent dc78c35b50 776020cc12

commit 71b8ba4d43

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

Diff Content Not Available