bigbluebutton-Github/bigbluebutton-apps
Mateus Dalepiane 76f6b28e69 Merge branch '090-multivideo' into mconf-live0.6.1
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
2014-09-04 13:28:21 -03:00
..
src Merge branch '090-multivideo' into mconf-live0.6.1 2014-09-04 13:28:21 -03:00
.classpath.old - make it compile 2012-07-16 19:03:12 +00:00
.gitignore - cleanup and adding bin to gitignore 2010-09-25 11:17:24 -04:00
build.gradle - upgrade to latest red5 release 2014-08-14 07:19:59 -07:00
gradle.properties - add gradle properties file to externalize version numbers 2013-09-30 18:09:21 +00:00
README - add README 2010-06-30 11:59:58 -04:00
vm-build-debug.sh enhance vm-build-debug.sh to exit when there is a build failure 2011-03-01 14:49:30 -06:00
vm-build.sh - modify to use resolveDeps 2010-07-21 13:11:20 -04:00

 - see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB