bigbluebutton-Github/bigbluebutton-apps
Ghazi Triki 0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01:00
..
src Merge branch 'master' into breakout-rooms-porto-algre-2015 2016-01-27 14:16:05 +01: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' into breakout-rooms-porto-algre-2015 2016-01-27 14:16:05 +01: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