Skip to content
GitLab
Commit 9cd76d1f authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'wince-port' 

Conflicts:
	linphone/mediastreamer2/build/wince/alldescs.h
	linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
	linphone/oRTP/build/wince/oRTP.vcproj
parents 725a8b65 2db64326
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2761 additions and 2477 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