Richard Alam 9408316e53 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into update-screenshare-ffmpeg-jars ... Conflicts: bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar bbb-screenshare/app/jws/lib/ffmpeg.jar bbb-screenshare/app/jws/lib/javacpp.jar bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar bbb-screenshare/app/jws/lib/javacv.jar		2016-06-02 21:14:59 +00:00
..
app	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into update-screenshare-ffmpeg-jars	2016-06-02 21:14:59 +00:00
jws	- bring in classes from javacv jar instead of adding the jar as a	2016-06-02 20:58:20 +00:00
.classpath	- setup all JavaCV jar files	2016-02-11 19:50:23 +00:00
.gitignore	config updates	2016-05-27 14:30:16 -04:00
.project	- new screenshare red5 app	2016-02-10 19:53:01 +00:00