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
..
app	Merge branch 'refactor-voice-users' into merge-polling-with-master	2014-01-28 21:12:01 +00:00
applet	Merge branch 'refactor-voice-users' into merge-polling-with-master	2014-01-28 21:12:01 +00:00
common	- upgrade to gradle 1.7	2013-09-17 18:10:52 +00:00
.gitignore	- cleanup	2010-09-08 17:14:42 -04:00
build.gradle	- upgrade to gradle 1.7	2013-09-17 18:10:52 +00:00
settings.gradle	copying from dev branch to trunk	2009-10-23 14:47:31 +00:00
vm-build.sh	Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel	2010-06-29 05:07:00 +00:00