Commit Graph

2 Commits

Author SHA1 Message Date
Joel Martin 9c2a41fe0e Merge commit 'kumina/master'
Conflicts:

	wsproxy.c

Conflicts:
	.gitignore
	Makefile
	README.md
2011-07-11 19:14:11 -05:00
Joel Martin 6d1e216115 fork noVNC, rename to websockify, cleanup.
Split of wsproxy from noVNC and rename it websockify.
2011-01-12 18:09:54 -06:00