mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 04:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3765 commits 37 branches 183 tags 128 MiB
Commit graph

3 commits

Author SHA1 Message Date
Margaux Clerc
9143a61ad0 Update in_app ui 
[--force]
 2016-06-28 16:22:11 +02:00
Margaux Clerc
0da687df64 Merge branch 'master' into dev_in_app_purchase 
Conflicts:
	AndroidManifest.xml
	res/raw/linphonerc_factory
	res/values/non_localizable_custom.xml
	res/xml/preferences.xml
	src/org/linphone/LinphonePreferences.java
	src/org/linphone/SettingsFragment.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/setup/SetupActivity.java
	src/org/linphone/xmlrpc/XmlRpcHelper.java
	src/org/linphone/xmlrpc/XmlRpcListener.java
	src/org/linphone/xmlrpc/XmlRpcListenerBase.java
 2016-06-28 14:56:42 +02:00
Sylvain Berfini
3d24d20194 Started in-app purchase 2015-04-21 13:18:37 +02:00