Tsuda Kageyu
|
2b5fee2df1
|
Merge branch 'master' into merge-master
Conflicts:
AUTHORS
ConfigureChecks.cmake
config.h.cmake
taglib/toolkit/tbytevector.cpp
taglib/toolkit/tfilestream.cpp
taglib/toolkit/tstring.cpp
tests/test_id3v2.cpp
|
2013-05-19 15:45:15 +09:00 |
|
Tsuda Kageyu
|
79f3edebc0
|
Added myself to AUTHORS
|
2013-05-19 11:59:37 +09:00 |
|
Tsuda Kageyu
|
39e02ad21b
|
Added myself to AUTHORS
|
2013-03-24 01:15:25 +09:00 |
|
Mathias Panzenböck
|
868ce3dd21
|
added myself to AUTHORS
|
2011-06-14 15:23:11 +02:00 |
|
Lukáš Lalinský
|
266200d77e
|
Add myself to the AUTHORS file
|
2011-04-09 20:09:51 +02:00 |
|
Scott Wheeler
|
f162c5f5f9
|
And now get everything building again...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@588037 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
|
2006-09-24 18:10:30 +00:00 |
|