Ilari Liusvaara d88cb4fb15 Merge branch 'rr1-maint' ... Conflicts: src/core/memorymanip.cpp src/platform/wxwidgets/memorysearch.cpp		2013-05-10 13:34:12 +03:00
..
wxwidgets	Merge branch 'rr1-maint'	2013-05-10 13:34:12 +03:00