Changeset 1189:8a2e8b360ac3 in mediastreamer2

Timestamp:
Oct 21, 2010 10:38:03 PM (3 years ago)
Author:
Simon Morlat <simon.morlat@…>
Branch:
default
Parents:
1188:27fdd2536b36 (diff), 1178:7b777333aa3d (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' into dev_android_video

(No files)

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