76f6b28e69
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as |
||
---|---|---|
.. | ||
src | ||
.classpath.old | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
README | ||
vm-build-debug.sh | ||
vm-build.sh |
- see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB