Merge branch 'master' into GUAC-546-REWRITE

Conflicts:
	guacamole/src/main/webapp/scripts/client-ui.js
This commit is contained in:
Michael Jumper
2014-11-22 13:14:55 -08:00

View File

@@ -10,6 +10,7 @@
<param name="width" type="numeric" title="Display width"/> <param name="width" type="numeric" title="Display width"/>
<param name="height" type="numeric" title="Display height"/> <param name="height" type="numeric" title="Display height"/>
<param name="dpi" type="numeric" title="Display resolution (DPI)"/>
<param name="color-depth" type="enum" title="Color depth"> <param name="color-depth" type="enum" title="Color depth">
<option value="8">256 color</option> <option value="8">256 color</option>
<option value="16">Low color (16-bit)</option> <option value="16">Low color (16-bit)</option>