Changeset 249:626b188df442 in verona


Ignore:
Timestamp:
Jun 28, 2011 1:58:27 PM (2 years ago)
Author:
Vadim Lebedev <vadim@…>
Branch:
default
Parents:
248:1ca8c26b41ac (diff), 246:db1a67b66603 (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

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r246 r249  
    11a1bd05cf1becfa567d269e68ab312ed4154d4ab2 libs/hlibpp 
    22cb83411a9e6657814a3f0e0b5d96bbb132540511 libs/miniini 
    3 e08a5e3d64479743513c2d6fbf7d7c5cfa0427bd libs/srtp 
     3901c9952b3bf2cfc29d30111e104b4971b739187 libs/srtp 
    44a823790e30a34da806085cd31d69302954ff369b mediastreamer2 

  • .hgsubstate

    r248 r249  
    22cb83411a9e6657814a3f0e0b5d96bbb132540511 libs/miniini 
    33901c9952b3bf2cfc29d30111e104b4971b739187 libs/srtp 
    4 0b9798565433cd06916508124af8e3ed20217ff6 mediastreamer2 
     4a823790e30a34da806085cd31d69302954ff369b mediastreamer2 
Note: See TracChangeset for help on using the changeset viewer.