Changeset 1376:38e481f9389c in mediastreamer2

Timestamp:
May 6, 2011 10:53:51 AM (2 years ago)
Author:
Guillaume Beraudo <guillaume.beraudo@…>
Branch:
default
Parents:
1368:ac122ded501e (diff), 1375:cc4c4148e0cb (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' of git.linphone.org:mediastreamer2 into dev_videomac

(No files)

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