Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

Olm
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e63be977

Commit e63be977 authored 8 years ago by pedroGitt

Downloads
- Patches
- Plain Diff

Update with master branch => OLM V2.0.0

parent 7a689764

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

java/android/OlmLibSdk/olm-sdk/build.gradle 1 addition, 1 deletion

java/android/OlmLibSdk/olm-sdk/build.gradle
java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java 6 additions, 2 deletions

.../androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java 12 additions, 3 deletions

.../src/main/java/org/matrix/olm/OlmInboundGroupSession.java
java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk 2 additions, 2 deletions

java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp 21 additions, 2 deletions

...LibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h 1 addition, 1 deletion

...lmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h

with 43 additions and 11 deletions

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