Commit e1c2a383 authored by smorlat's avatar smorlat
Browse files

Merge branch 'wince-port'

Conflicts:
	linphone/coreapi/exevents.c
	linphone/coreapi/friend.c
	linphone/coreapi/linphonecore.c
	linphone/coreapi/lpconfig.c
	linphone/mediastreamer2/build/wince/mediastreamer2.def
	linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
	linphone/mediastreamer2/src/msvolume.c
	linphone/oRTP/build/wince/oRTP.vcproj
	linphone/oRTP/src/rtpsession.c

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@801 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parents a25dde87 fd0c5550
No related merge requests found
Showing with 1275 additions and 224 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment