Commit graph

2 commits

Author SHA1 Message Date
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
Ilari Liusvaara
41b62bc937 Add a missing header file and correct win32 build error 2012-10-14 23:55:36 +03:00