Merge branch 'next-release'

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

View file

@ -1,5 +1,5 @@
<?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>
<title>VGA Color Display</title>
<control type="container" pos="right">

View file

@ -1,5 +1,5 @@
<?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>
<title>VGA Color Display</title>
<control type="container" pos="right">