Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-client-android
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

96a1ef0d

Commit 96a1ef0d authored 10 years ago by Alexandre Lision

Downloads
- Plain Diff

Merge branch contrib_android onto master

parents 33936efb 40734325

No related branches found

No related tags found

No related merge requests found

Changes 1000

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 7 deletions

.gitignore
.gitmodules 0 additions, 3 deletions

.gitmodules
Makefile 102 additions, 13 deletions

Makefile
adb-push-sflphone.sh 0 additions, 85 deletions

adb-push-sflphone.sh
compile.sh 324 additions, 0 deletions

compile.sh
configure.sh 55 additions, 0 deletions

configure.sh
jni/Android.mk 0 additions, 456 deletions

jni/Android.mk
jni/libccrtp/Android.mk 0 additions, 67 deletions

jni/libccrtp/Android.mk
jni/libccrtp/sources/.cvsignore 0 additions, 20 deletions

jni/libccrtp/sources/.cvsignore
jni/libccrtp/sources/.gitignore 0 additions, 46 deletions

jni/libccrtp/sources/.gitignore
jni/libccrtp/sources/AUTHORS 0 additions, 7 deletions

jni/libccrtp/sources/AUTHORS
jni/libccrtp/sources/CMakeLists.txt 0 additions, 163 deletions

jni/libccrtp/sources/CMakeLists.txt
jni/libccrtp/sources/COPYING 0 additions, 339 deletions

jni/libccrtp/sources/COPYING
jni/libccrtp/sources/COPYING.addendum 0 additions, 20 deletions

jni/libccrtp/sources/COPYING.addendum
jni/libccrtp/sources/ChangeLog 0 additions, 988 deletions

jni/libccrtp/sources/ChangeLog
jni/libccrtp/sources/INSTALL 0 additions, 182 deletions

jni/libccrtp/sources/INSTALL
jni/libccrtp/sources/Makefile 0 additions, 930 deletions

jni/libccrtp/sources/Makefile
jni/libccrtp/sources/Makefile.am 0 additions, 35 deletions

jni/libccrtp/sources/Makefile.am
jni/libccrtp/sources/Makefile.in 0 additions, 930 deletions

jni/libccrtp/sources/Makefile.in
jni/libccrtp/sources/NEWS 0 additions, 17 deletions

jni/libccrtp/sources/NEWS

with 484 additions and 4308 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

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