Ilari Liusvaara 7d19748ed2 Merge branch 'rr1-maint' ... Conflicts: src/platform/wxwidgets/mainwindow.cpp		2012-02-20 21:19:53 +02:00
..
sdl	More code file moving	2012-02-07 16:34:58 +02:00
wxwidgets	Merge branch 'rr1-maint'	2012-02-20 21:19:53 +02:00