Ilari Liusvaara
73d58b5402
Wxwidgets: Make scaling factors be global variables
2012-04-07 11:42:22 +03:00
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
Ilari Liusvaara
c3dd13fb3f
Merge remote-tracking branch 'origin/rr1-maint'
...
Conflicts:
Makefile
src/lua/core.cpp
src/lua/lua.cpp
2012-03-07 06:19:06 +02:00
Ilari Liusvaara
7d19748ed2
Merge branch 'rr1-maint'
...
Conflicts:
src/platform/wxwidgets/mainwindow.cpp
2012-02-20 21:19:53 +02:00
Ilari Liusvaara
67da5fdf39
Merge branch 'rr1-maint'
2012-02-19 20:19:44 +02:00
Ilari Liusvaara
7b9b67b9ec
More code file moving
...
Move platform files from src/plat-* to src/platform/* (and similarly
for include files).
2012-02-07 16:34:58 +02:00
