Richard Alam 29e94500c4 Merge branch 'refactor-voice-users' into merge-polling-with-master ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml		2014-01-28 21:12:01 +00:00
..
.settings	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
src	- update blocks by row instead of by block to speed up updates in eyes of user	2013-10-22 20:11:46 +00: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	- upgrade to gradle 1.7	2013-09-17 18:10:52 +00:00