Richard Alam ee4e5f1a47 Merge branch 'master' into upgrade-to-red5-nov-4-2014		2014-11-14 03:49:14 -08:00
..
.settings	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
src	Merge branch 'master' into upgrade-to-red5-nov-4-2014	2014-11-14 03:49:14 -08:00
.classpath.old	- add license header for deskshare	2010-11-06 11:17:57 -04:00
.gitignore	a couple of fixes that enabled an upgrade to Scala 2.9.2 and make deskshare debuggable in Eclipse (w. Scala IDE)	2012-07-10 22:22:05 +02:00
build.gradle	- add more logging about the connection to red5	2014-11-07 22:09:49 +00:00