mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Lukáš Lalinský 2012-03-18 09:22:53 +01:00
commit 2a4850f211
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -48,7 +48,7 @@ endif()
set(TAGLIB_LIB_MAJOR_VERSION "1")
set(TAGLIB_LIB_MINOR_VERSION "7")
set(TAGLIB_LIB_PATCH_VERSION "0")
set(TAGLIB_LIB_PATCH_VERSION "1")
set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
@ -57,7 +57,7 @@ set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VE
# 3. If any interfaces have been added since the last public release, then increment age.
# 4. If any interfaces have been removed since the last public release, then set age to 0.
set(TAGLIB_SOVERSION_CURRENT 11)
set(TAGLIB_SOVERSION_REVISION 0)
set(TAGLIB_SOVERSION_REVISION 1)
set(TAGLIB_SOVERSION_AGE 10)
math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")

2
taglib/ape/apefooter.cpp
View File

@ -24,7 +24,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include <ostream>
#include <iostream>
#include <bitset>
#include <tstring.h>

2
taglib/mpeg/id3v2/id3v2header.cpp
View File

@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include <ostream>
#include <iostream>
#include <bitset>
#include <tstring.h>

2
taglib/mpeg/id3v2/id3v2synchdata.cpp
View File

@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include <ostream>
#include <iostream>
#include "id3v2synchdata.h"

2
taglib/toolkit/tbytevector.cpp
View File

@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include <ostream>
#include <iostream>
#include <tstring.h>
#include <tdebug.h>

2
taglib/toolkit/tbytevector.h
View File

@ -30,7 +30,7 @@
#include "taglib_export.h"
#include <vector>
#include <ostream>
#include <iostream>
namespace TagLib {

2
taglib/toolkit/tstring.cpp
View File

@ -28,7 +28,7 @@
#include "tdebug.h"
#include "tstringlist.h"
#include <ostream>
#include <iostream>
#include <string.h>

2
taglib/toolkit/tstring.h
View File

@ -31,7 +31,7 @@
#include "tbytevector.h"
#include <string>
#include <ostream>
#include <iostream>
/*!
* \relates TagLib::String

2
taglib/toolkit/tstringlist.h
View File

@ -31,7 +31,7 @@
#include "tbytevectorlist.h"
#include "taglib_export.h"
#include <ostream>
#include <iostream>
namespace TagLib {