bigbluebutton-Github/bigbluebutton-apps
Anton Georgiev 8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
2015-10-22 20:46:30 +00:00
..
src Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 2015-10-22 20:46:30 +00:00
.classpath.old - make it compile 2012-07-16 19:03:12 +00:00
.gitignore
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
README
vm-build-debug.sh
vm-build.sh

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