bigbluebutton-Github/bigbluebutton-apps
Richard Alam 93311e6464 Merge branch 'master' into merge-master-into-polling-module
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
2013-02-04 19:34:23 +00:00
..
src Merge branch 'master' into merge-master-into-polling-module 2013-02-04 19:34:23 +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 - embed scala lib 2012-10-30 16:27:19 +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