linphone-android/res/xml
Sylvain Berfini 75934a5400 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
..
account_preferences.xml add userid +upnp settings 2013-03-05 16:36:49 +01:00
preferences.xml Merge remote-tracking branch 'master/master' into bellesip 2013-06-12 10:59:39 +02:00