]> granicus.if.org Git - taglib/commit
Merge branch 'stable'
authorLukáš Lalinský <lalinsky@gmail.com>
Sun, 18 Mar 2012 08:22:53 +0000 (09:22 +0100)
committerLukáš Lalinský <lalinsky@gmail.com>
Sun, 18 Mar 2012 08:22:53 +0000 (09:22 +0100)
commit2a4850f2113ecedd6e86697b024d29802d8e89e3
tree1cc7e48496e4efc4dd2471d1fe8d209f10fb264e
parent3c7b05a9006a1d5367db2144168f664858005d9b
parent288c6e4a3f90b8f0bf9e679d07bde70575434504
Merge branch 'stable'

Conflicts:
CMakeLists.txt
CMakeLists.txt
taglib/mpeg/id3v2/id3v2header.cpp
taglib/toolkit/tbytevector.cpp
taglib/toolkit/tbytevector.h
taglib/toolkit/tstring.cpp
taglib/toolkit/tstring.h