Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-release'

Browse source
This commit is contained in:
Jeff Parsons 2016-02-09 08:52:55 -08:00
commit 35fbf9a59a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<video id="videoVGA" model="vga" screenwidth="640" screenheight="480" scale="true" autolock="true" pos="center" padding="8px"> <video id="videoVGA" model="vga" screenwidth="640" screenheight="480" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
<menu> <menu>
<title>VGA Color Display</title> <title>VGA Color Display</title>
<control type="container" pos="right"> <control type="container" pos="right">

2
devices/pc/video/ibm/vga/ibm-vga-lockfs.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<video id="videoVGA" model="vga" screenwidth="640" screenheight="480" scale="true" pos="center" padding="8px"> <video id="videoVGA" model="vga" screenwidth="640" screenheight="480" scale="true" touchscreen="mouse" pos="center" padding="8px">
<menu> <menu>
<title>VGA Color Display</title> <title>VGA Color Display</title>
<control type="container" pos="right"> <control type="container" pos="right">