Changeset 910:f4f8118b46ff in mediastreamer2

Timestamp:
Mar 12, 2010 6:54:40 PM (3 years ago)
Author:
Simon Morlat <simon.morlat@…>
Branch:
default
Children:
911:b846f4a7be3f, 914:6d4cb6fa9644
Parents:
908:6d6d89ca5eae (diff), 909:c7abe5d46b50 (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 belledonne-communications.com:mediastreamer2-private

Conflicts:

src/gsm.c

(No files)

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