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
|
bd0ef203c1
|
Merge branch 'rr1-maint'
|
2012-03-03 13:32:09 +02:00 |
|
Ilari Liusvaara
|
e646c60600
|
Merge branch 'rr1-maint'
Conflicts:
include/core/render.hpp
|
2012-03-03 11:31:44 +02:00 |
|
Ilari Liusvaara
|
d8319ef4a9
|
Lua Bitmap WIP
|
2012-03-03 11:27:26 +02:00 |
|
Ilari Liusvaara
|
d45b316380
|
Refactor makefile
Refactor the makefile and move some code files to more logical places.
|
2012-02-06 05:38:51 +02:00 |
|