]> granicus.if.org Git - taglib/commitdiff
projects / taglib / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 500b3e6 1ce5385)
Merge branch 'krejclu6_chapters' of https://github.com/krejclu6/taglib into krejclu6_...
authorLukas Krejci <krejclu6@fel.cvut.cz>
Sun, 18 May 2014 14:29:54 +0000 (16:29 +0200)
committerLukas Krejci <krejclu6@fel.cvut.cz>
Sun, 18 May 2014 14:29:54 +0000 (16:29 +0200)
Conflicts:
taglib/mpeg/id3v2/id3v2framefactory.cpp
tests/test_id3v2.cpp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.