Changeset 01f1b2e


Ignore:
Timestamp:
05/31/12 23:24:58 (12 months ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, storage
Children:
f642e59
Parents:
48a34e7 (diff), a2a9f8d (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.
git-author:
yomguy <yomguy@…> (05/31/12 23:24:58)
git-committer:
yomguy <yomguy@…> (05/31/12 23:24:58)
Message:

Merge branch 'dev'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • README.rst

    r04ec884 ra2a9f8d  
    5555 * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player 
    5656 * RECOMMEND: install django-extensions 
     57 * transitional package to 1.5 (maybe 1.4.4 *soon*) 
    5758 
    58591.4.2 
Note: See TracChangeset for help on using the changeset viewer.