Changeset 1163:4ae535305aeb in mediastreamer2

Timestamp:
Oct 4, 2010 9:45:51 PM (3 years ago)
Author:
Simon Morlat <simon.morlat@…>
Branch:
default
Parents:
1162:5686225e3519 (diff), 1160:6024934ec418 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of git.linphone.org:mediastreamer2

(No files)

Note: See TracChangeset for help on using the changeset viewer.