bigbluebutton-Github/bigbluebutton-apps
Felipe Cecagno 13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
2015-04-01 10:19:17 -03:00
..
src Merge branch 'issue1534' into mconf-live0.6.2 2015-04-01 10:19:17 -03:00
.classpath.old
.gitignore
build.gradle - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
gradle.properties
README
vm-build-debug.sh
vm-build.sh

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