Ilari Liusvaara 73fd1d4737 Merge branch 'rr1-maint' ... Conflicts: include/core/loadlib.hpp src/core/loadlib.cpp src/platform/wxwidgets/mainwindow.cpp		2013-03-25 11:35:41 +02:00
..
wxwidgets	Merge branch 'rr1-maint'	2013-03-25 11:35:41 +02:00