bigbluebutton-Github/bbb-voice
Felipe Cecagno 334ed6db81 Merge branch 'master' into sharedNotes0.8
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/html-template/index.template.html
	bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
2012-02-17 14:04:31 -02: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 - trim paramaters for sip server 2012-01-25 21:10:50 +00:00
.gitignore - registers OK 2010-06-17 15:55:58 -04:00
build.gradle upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00: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 few corrections in order to make the shared notes module working; it is needed to run in the backend both live notes server and redis server 2011-09-19 15:02:52 +00:00

To build
gradle copyToLib
gradle eclipse

import into eclipse
setup build path