Changeset 1353:44ee3ed05162 in mediastreamer2

Timestamp:
Apr 6, 2011 3:12:18 PM (2 years ago)
Author:
Guillaume Beraudo <guillaume.beraudo@…>
Branch:
default
Children:
1354:46056d013b02, 1356:5975a97c6348
Parents:
1347:b59e17a17997 (diff), 1352:a7ae9e177241 (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.