Commit graph

5 commits

Author SHA1 Message Date
Guillaume Beraudo
013e835343 Merge branch 'video' of git.linphone.org:linphone-android-private
Conflicts:
	libs/armeabi-v7a/liblinphone.so
	libs/armeabi/liblinphone.so
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneProxyConfigImpl.java
	src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
	submodules/linphone
2010-12-14 09:32:47 +01:00
Guillaume Beraudo
aa289edda1 Bind proxyconfig properties and update registration tutorial. 2010-12-13 15:21:12 +01:00
Guillaume Beraudo
16749d14d3 Simplify registration tutorial. 2010-12-07 10:32:52 +01:00
Guillaume Beraudo
299b7c95c3 Cleanup 2010-11-09 09:29:06 +01:00
Guillaume Beraudo
d68b8fb8ea Added activities to support java port of the C tutorials. 2010-11-05 17:45:24 +01:00