Ilari Liusvaara 1ae101ab44 Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint ... Merge most of the devbranch work (up until splitting the core starts) into rr1-maint. This is mostly to make maintenance easier, even if it introduces some changes that could be bit big into maint branch. Conflicts: src/platform/wxwidgets/mainwindow.cpp		2012-04-05 10:48:29 +03:00
..
dummy.cpp	Fix Win32 building	2012-02-12 13:13:33 +02:00
dumpmenu.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
editor-authors.cpp	More code file moving	2012-02-07 16:34:58 +02:00
editor-axis.cpp	More code file moving	2012-02-07 16:34:58 +02:00
editor-keyselect.cpp	Merge branch 'rr1-maint'	2012-02-21 14:37:21 +02:00
editor-paths.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
editor-screen.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
editor-settings.cpp	Make settings window scrollable so it doesn't grow excessively large	2012-02-16 20:41:31 +02:00
foreground.cpp	More code file moving	2012-02-07 16:34:58 +02:00
keyboard.cpp	Merge remote-tracking branch 'origin/rr1-maint'	2012-03-07 06:19:06 +02:00
main.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
mainwindow.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
Makefile	More code file moving	2012-02-07 16:34:58 +02:00
memorysearch.cpp	More code file moving	2012-02-07 16:34:58 +02:00
messages.cpp	More code file moving	2012-02-07 16:34:58 +02:00
romselect.cpp	Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint	2012-04-05 10:48:29 +03:00
status.cpp	Merge remote-tracking branch 'origin/rr1-maint'	2012-03-07 06:19:06 +02:00
thread.cpp	More code file moving	2012-02-07 16:34:58 +02:00