Mateus Dalepiane f261601fa8 Merge branch 'ios-video-support' into mconf-live0.6.3 ... Conflicts: bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java		2015-04-24 14:39:15 -03:00
..
src/main	Merge branch 'ios-video-support' into mconf-live0.6.3	2015-04-24 14:39:15 -03:00
.gitignore	cleanup	2014-09-04 15:02:35 -03:00
build.gradle	Merge branch '090-encrypted-recording' into mconf-live0.6.2	2015-01-21 18:11:56 -02:00
vm-build.sh	- change build using gradle	2011-06-13 12:25:18 -04:00