Commit 91cf4d60 authored 14 years ago by deniszgonjanin

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

parents 3990d323 5e185717

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.64.jar 0 additions, 0 deletions

...utton-client/resources/prod/bbb-deskshare-applet-0.64.jar
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/events/CaptureEndBlockEvent.java 7 additions, 1 deletion

...ebutton/deskshare/server/events/CaptureEndBlockEvent.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/events/CaptureStartBlockEvent.java 7 additions, 1 deletion

...utton/deskshare/server/events/CaptureStartBlockEvent.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/events/CaptureUpdateBlockEvent.java 8 additions, 4 deletions

...tton/deskshare/server/events/CaptureUpdateBlockEvent.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/events/MouseLocationEvent.java 7 additions, 1 deletion

...luebutton/deskshare/server/events/MouseLocationEvent.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/servlet/HttpTunnelStreamController.java 9 additions, 6 deletions

.../deskshare/server/servlet/HttpTunnelStreamController.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/session/ISessionManagerGateway.java 4 additions, 4 deletions

...tton/deskshare/server/session/ISessionManagerGateway.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/socket/BlockStreamEventMessageHandler.java 5 additions, 5 deletions

...skshare/server/socket/BlockStreamEventMessageHandler.java
deskshare/app/src/main/java/org/bigbluebutton/deskshare/server/socket/BlockStreamProtocolDecoder.java 23 additions, 14 deletions

...n/deskshare/server/socket/BlockStreamProtocolDecoder.java
deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/sessions/SessionManagerGateway.scala 7 additions, 7 deletions

...ton/deskshare/server/sessions/SessionManagerGateway.scala
deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/sessions/SessionManagerSVC.scala 9 additions, 9 deletions

...ebutton/deskshare/server/sessions/SessionManagerSVC.scala
deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/sessions/SessionSVC.scala 5 additions, 5 deletions

.../bigbluebutton/deskshare/server/sessions/SessionSVC.scala
deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/svc1/Block.scala 12 additions, 4 deletions

...scala/org/bigbluebutton/deskshare/server/svc1/Block.scala
deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/svc1/BlockManager.scala 3 additions, 3 deletions

...rg/bigbluebutton/deskshare/server/svc1/BlockManager.scala
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/Block.java 5 additions, 2 deletions

...java/org/bigbluebutton/deskshare/client/blocks/Block.java
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/BlockManager.java 38 additions, 8 deletions

...g/bigbluebutton/deskshare/client/blocks/BlockManager.java
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/BlockMessage.java 5 additions, 5 deletions

.../org/bigbluebutton/deskshare/client/net/BlockMessage.java
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/BlockStreamProtocolEncoder.java 58 additions, 21 deletions

...tton/deskshare/client/net/BlockStreamProtocolEncoder.java
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java 39 additions, 23 deletions

...ebutton/deskshare/client/net/NetworkHttpStreamSender.java
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkSocketStreamSender.java 33 additions, 9 deletions

...utton/deskshare/client/net/NetworkSocketStreamSender.java

with 284 additions and 132 deletions

Please register or to comment