Merge branch 'rr1-maint'

This commit is contained in:
Ilari Liusvaara 2012-05-20 16:11:50 +03:00
commit 137a2bf9a2

View file

@ -27,7 +27,9 @@ void lua_callback_keyhook(const std::string& key, const struct keygroup::paramet
void init_lua() throw() {} void init_lua() throw() {}
void quit_lua() throw() {} void quit_lua() throw() {}
uint64_t lua_timed_hook(int timer) throw() { return 0x7EFFFFFFFFFFFFFFULL; } uint64_t lua_timed_hook(int timer) throw() { return 0x7EFFFFFFFFFFFFFFULL; }
void lua_callback_do_unsafe_rewind(const std::vector<char>& save, movie& mov, void* u) {} void lua_callback_do_unsafe_rewind(const std::vector<char>& save, uint64_t secs, uint64_t ssecs, movie& mov, void* u)
{
}
bool lua_requests_repaint = false; bool lua_requests_repaint = false;