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
|
30360a86d8
|
Merge branch 'rr1-maint'
Conflicts:
Makefile
include/library/minmax.hpp
src/core/avidump-control.cpp
src/core/rom.cpp
|
2012-02-23 17:44:28 +02:00 |
|
Ilari Liusvaara
|
79286ad0db
|
Merge branch 'rr1-maint'
|
2012-02-21 14:37:21 +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
|
9ecb1e97dc
|
Merge branch 'rr1-maint'
|
2012-02-20 18:48:00 +02:00 |
|
Ilari Liusvaara
|
67da5fdf39
|
Merge branch 'rr1-maint'
|
2012-02-19 20:19:44 +02:00 |
|
Ilari Liusvaara
|
61f86a8796
|
Make settings window scrollable so it doesn't grow excessively large
|
2012-02-16 20:41:31 +02:00 |
|
Ilari Liusvaara
|
fab8d8f4e3
|
Library loading support
Support loading shared objects and such at runtime.
|
2012-02-12 13:16:12 +02:00 |
|
Ilari Liusvaara
|
2da4177f87
|
Fix Win32 building
Turns out build is broken. Fix it.
|
2012-02-12 13:13:33 +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 |
|