Permalink
Browse files

Merge branch 'stable'

Conflicts:
	CMakeLists.txt
  • Loading branch information...
2 parents 3c7b05a + 288c6e4 commit 2a4850f2113ecedd6e86697b024d29802d8e89e3 @lalinsky lalinsky committed Mar 18, 2012
View
4 CMakeLists.txt
@@ -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}")
View
2 taglib/ape/apefooter.cpp
@@ -24,7 +24,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
-#include <ostream>
+#include <iostream>
#include <bitset>
#include <tstring.h>
View
2 taglib/mpeg/id3v2/id3v2header.cpp
@@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
-#include <ostream>
+#include <iostream>
#include <bitset>
#include <tstring.h>
View
2 taglib/mpeg/id3v2/id3v2synchdata.cpp
@@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
-#include <ostream>
+#include <iostream>
#include "id3v2synchdata.h"
View
2 taglib/toolkit/tbytevector.cpp
@@ -23,7 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
-#include <ostream>
+#include <iostream>
#include <tstring.h>
#include <tdebug.h>
View
2 taglib/toolkit/tbytevector.h
@@ -30,7 +30,7 @@
#include "taglib_export.h"
#include <vector>
-#include <ostream>
+#include <iostream>
namespace TagLib {
View
2 taglib/toolkit/tstring.cpp
@@ -28,7 +28,7 @@
#include "tdebug.h"
#include "tstringlist.h"
-#include <ostream>
+#include <iostream>
#include <string.h>
View
2 taglib/toolkit/tstring.h
@@ -31,7 +31,7 @@
#include "tbytevector.h"
#include <string>
-#include <ostream>
+#include <iostream>
/*!
* \relates TagLib::String
View
2 taglib/toolkit/tstringlist.h
@@ -31,7 +31,7 @@
#include "tbytevectorlist.h"
#include "taglib_export.h"
-#include <ostream>
+#include <iostream>
namespace TagLib {

0 comments on commit 2a4850f

Please sign in to comment.