Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

libjitsi
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

15f46dff

Commit 15f46dff authored 12 years ago by Werner Dittmann

Downloads
- Patches
- Plain Diff

Merge branch 'ingo'

Conflicts:
	trunk/lib/installer-exclude/libjitsi.jar

parent a38bb66c

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.classpath 2 additions, 1 deletion

.classpath
lib/bccontrib-1.0-SNAPSHOT.jar 0 additions, 0 deletions

lib/bccontrib-1.0-SNAPSHOT.jar
lib/bcprov-jdk15on-148.jar 0 additions, 0 deletions

lib/bcprov-jdk15on-148.jar
lib/lcrypto-jdk16-143.jar 0 additions, 0 deletions

lib/lcrypto-jdk16-143.jar
lib/zrtp4j-light.jar 0 additions, 0 deletions

lib/zrtp4j-light.jar
src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java 2 additions, 0 deletions

...itsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java 2 additions, 0 deletions

...jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java

with 6 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment