Changeset 1400:cf2e5e29b967 in mediastreamer2

Timestamp:
May 26, 2011 8:31:20 PM (2 years ago)
Author:
Vadim Lebedev <vadim@…>
Branch:
default
Parents:
1399:a917a65b9ec0 (diff), 1103:d8215a13f137 (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

(No files)

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