bigbluebutton-Github/bbb-voice
Pedro Beschorner Marin e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
2016-06-20 16:11:04 +00:00
..
lib - adding build and lib folder while ignoring their contents. This way, the build and lib folder 2010-06-15 15:56:20 -04:00
src Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 2016-06-20 16:11:04 +00:00
.gitignore - change poll config for jedis 2015-08-23 07:09:00 -04:00
build.gradle update dependencies not available anymore on Blindside Networks Google Code repository 2016-06-14 11:22:16 -03:00
INSTALL - test tracking branch 2010-06-18 20:42:52 +00:00
README - add build info and test tracking branch again 2010-06-18 21:00:29 +00:00
testng.xml - add testng.xml for unit testing 2010-08-20 11:02:57 -04:00
vm-build.sh - modify to use new gradle task 2010-08-20 11:03:32 -04:00

To build
gradle copyToLib
gradle eclipse

import into eclipse
setup build path