Tsuda Kageyu
|
c2753f8d3c
|
Merge branch 'master' into merge-master-to-taglib2
# Conflicts:
# ConfigureChecks.cmake
# bindings/c/tag_c.cpp
# taglib-config.cmd.cmake
# taglib/asf/asfattribute.cpp
# taglib/asf/asffile.cpp
# taglib/audioproperties.cpp
# taglib/mp4/mp4atom.h
# taglib/mp4/mp4coverart.cpp
# taglib/mp4/mp4file.cpp
# taglib/mp4/mp4item.cpp
# taglib/mp4/mp4tag.cpp
# taglib/mpeg/id3v2/id3v2frame.cpp
# taglib/mpeg/id3v2/id3v2tag.cpp
# taglib/toolkit/tbytevector.cpp
# taglib/toolkit/tbytevector.h
# taglib/toolkit/tfile.cpp
# taglib/toolkit/tfile.h
# taglib/toolkit/tlist.h
# taglib/toolkit/tstring.cpp
# taglib/toolkit/tstring.h
# tests/test_apetag.cpp
|
2015-11-19 11:37:18 +09:00 |
|
Lukáš Lalinský
|
aedfeba66b
|
Missed the full version string in taglib-config.cmd.cmake
|
2015-08-25 20:46:11 +02:00 |
|
Tsuda Kageyu
|
bd84c8928a
|
Merge branch 'master' into merge-master-to-taglib2
Conflicts:
taglib/riff/wav/infotag.cpp
taglib/toolkit/trefcounter.h
taglib/toolkit/tstring.cpp
taglib/toolkit/tstring.h
taglib/xm/xmfile.cpp
tests/test_string.cpp
|
2014-02-18 17:32:05 +09:00 |
|
Lukáš Lalinský
|
95776b5905
|
These files should not be marked as executable
|
2013-10-06 17:11:01 +02:00 |
|
Festus Hagen
|
1086d4476d
|
Win32 taglib-config.cmd support.
|
2012-09-28 21:41:45 -04:00 |
|