Commit graph

5 commits

Author SHA1 Message Date
Sylvain Berfini
babcbef93e Merge remote-tracking branch 'newui/newUI' into newUI
Conflicts:
	AndroidManifest.xml
	build.xml
	src/org/linphone/DialerActivity.java
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/LinphoneSimpleListener.java
	src/org/linphone/LinphoneUtils.java
	src/org/linphone/VideoCallActivity.java
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java
2012-07-11 11:53:33 +02:00
Sylvain Berfini
ebca161b7e Fix some issues + multiple audio calls started 2012-07-10 16:10:54 +02:00
Sylvain Berfini
4883c016a2 Refactoring on drawables' names 2012-07-03 13:41:39 +02:00
Sylvain Berfini
476abbbf87 Own implementation of sliders to answer or not an incoming call 2012-06-22 18:26:07 +02:00
Sylvain Berfini
1ae90b9629 Some issues fixed + chat notification + account assistant started 2012-06-21 16:44:23 +02:00