Felipe Cecagno b7130a379f Merge branch '090-java-detection' into HEAD ... Conflicts: bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/resources/prod/BigBlueButton.html bigbluebutton-client/resources/prod/lib/bbb_deskshare.js bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml		2015-01-25 18:19:13 -02:00
..
app	- update to latest red5 with local connection ishared object fix	2015-01-13 18:08:03 +00:00
applet	Merge branch '090-java-detection' into HEAD	2015-01-25 18:19:13 -02:00
common	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
.gitignore	- cleanup	2010-09-08 17:14:42 -04:00
build.gradle	- update to latest red5 with local connection ishared object fix	2015-01-13 18:08:03 +00:00
settings.gradle	copying from dev branch to trunk	2009-10-23 14:47:31 +00:00
vm-build.sh	Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel	2010-06-29 05:07:00 +00:00