Merge remote branch 'upstream/master'

Browse Source

Conflicts:
	include/canvas.js
	include/default_controls.js
	include/vnc.js

...

This commit is contained in:

primalmotion

2010-07-22 20:29:21 +02:00

parent 30a532d38c a8edf9d8a5

commit 61bddad2ea

6 changed files with 1669 additions and 1670 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

include/vnc.js

+4 -1600

File diff suppressed because it is too large Load Diff