bigbluebutton-Github/bigbluebutton-apps
Anton Georgiev 5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
2015-12-11 17:23:27 +00:00
..
src Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 2015-12-11 17:23:27 +00: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 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 2015-10-22 20:46:30 +00: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