Felipe Cecagno a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bbb-video/build.gradle bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-config/web/default.pdf		2014-11-22 20:28:39 -02:00
..
src/main	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
.gitignore	cleanup	2014-09-04 15:02:35 -03:00
build.gradle	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
vm-build.sh	- change build using gradle	2011-06-13 12:25:18 -04:00