*sigh* merged for real this time.

This commit is contained in:
Bill Meltsner
2010-01-06 09:07:30 -06:00
2 changed files with 1256 additions and 1251 deletions
+2 -1
View File
@@ -272,8 +272,9 @@ function love.run()
while true do
if love.timer then
love.timer.step()
if love.update then love.update(dt) end -- passes 0 if timer is disabled
dt = love.timer.getDelta()
end
if love.update then love.update(dt) end -- will pass 0 if love.timer is disabled
if love.graphics then
love.graphics.clear()
if love.draw then love.draw() end
+1254 -1250
View File
File diff suppressed because it is too large Load Diff