From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- docs/source/techspecs/luaengine.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/source/techspecs/luaengine.rst') diff --git a/docs/source/techspecs/luaengine.rst b/docs/source/techspecs/luaengine.rst index 26d6da6a253..fa1c04cdb10 100644 --- a/docs/source/techspecs/luaengine.rst +++ b/docs/source/techspecs/luaengine.rst @@ -53,7 +53,7 @@ Let's first run MAME in a terminal to reach the LUA console: _/ _/ _/ _/_/_/_/ _/ _/ _/ _/_/_/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/_/_/ - mame v0.205 + mame v0.195 Copyright (C) Nicola Salmoria and the MAME team Lua 5.3 @@ -77,7 +77,7 @@ You can check at runtime which version of MAME you are running, with: :: [MAME]> print(emu.app_name() .. " " .. emu.app_version()) - mame 0.205 + mame 0.195 We now start exploring screen related methods. First, let's enumerate available screens: -- cgit v1.2.3-70-g09d2