Ilari Liusvaara efc06d1f10 Merge branch 'rr1-maint' ... Conflicts: manual.txt src/core/controller.cpp src/lua/dummy.cpp src/lua/input.cpp src/lua/lua.cpp src/platform/wxwidgets/mainwindow.cpp		2013-03-03 09:37:52 +02:00
..
bitmap.hpp	Merge branch 'rr1-maint'	2013-02-28 04:06:37 +02:00
internal.hpp	More paint / reset fixes	2013-02-28 10:36:57 +02:00
lua.hpp	Merge branch 'rr1-maint'	2013-03-03 09:37:52 +02:00
unsaferewind.hpp	Unsafe rewinding	2012-05-19 14:37:49 +03:00