bigbluebutton-Github/bigbluebutton-apps
Felipe Cecagno 7f991d1346 Merge branch 'master' into sharedNotesNoServer-0.81
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
2013-08-25 23:30:44 -03:00
..
src Merge branch 'master' into sharedNotesNoServer-0.81 2013-08-25 23:30:44 -03: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 - upgrade to red5 r4643 2013-05-18 21:39:53 +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