2 Commits

Author	SHA1	Message	Date
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
pelya	ac10a8c8cf	Added broken 16bpp animated blitter	2014-05-31 23:30:20 +03:00