Changeset 1378:d0a5eae9d79d in mediastreamer2

Timestamp:
May 6, 2011 10:55:41 AM (2 years ago)
Author:
Guillaume Beraudo <guillaume.beraudo@…>
Branch:
default
Children:
1379:431ddea9ce9b, 1380:5d57b6389548
Parents:
1377:054a38021f4b (diff), 1376:38e481f9389c (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 'dev_videomac', remote branch 'origin'

(No files)

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