a2feb9bf5b
# Conflicts: # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala # bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala # bigbluebutton-client/branding/default/style/css/V2Theme.css # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf # bigbluebutton-client/locale/en_US/bbbResources.properties # bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as # bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as # bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml # bigbluebutton-html5/private/config/development/server/log.yaml
37 lines
782 B
Plaintext
37 lines
782 B
Plaintext
.DS_Store
|
|
._.DS_Store*
|
|
.metadata/
|
|
record-and-playback/playback-client-js/testmeeting/
|
|
record-and-playback/playback-web/playback-web-0.1.war
|
|
record-and-playback/.project
|
|
push_to_git.py
|
|
**/target/*
|
|
**/.cache-main
|
|
**/.cache-tests
|
|
.vagrant/*
|
|
**/.settings/*
|
|
*/.gradle
|
|
bbb-lti/.classpath
|
|
bbb-lti/.project
|
|
bbb-lti/bin
|
|
bbb-lti/lti-0.1.1.war
|
|
bbb-lti/make.sh
|
|
bbb-lti/deploy.sh
|
|
bbb-lti/target*
|
|
bbb-api-demo/bin*
|
|
bbb-api-demo/.classpath
|
|
bbb-api-demo/.project
|
|
bigbluebutton-web/.settings*
|
|
bigbluebutton-web/.classpath
|
|
bigbluebutton-web/.project
|
|
akka-bbb-apps/akka-bbb-apps*.log
|
|
bigbluebutton-html5/log/development.log
|
|
bigbluebutton-client/.actionScriptProperties
|
|
bigbluebutton-web/target-eclipse*
|
|
record-and-playback/.loadpath
|
|
clients/flash/**/build
|
|
clients/flash/**/.gradle
|
|
**/.idea/*
|
|
*.iml
|
|
*~
|