diff --git a/beets/__init__.py b/beets/__init__.py index a0a74f3a8..7475146e2 100644 --- a/beets/__init__.py +++ b/beets/__init__.py @@ -12,7 +12,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -__version__ = '1.0b14' +__version__ = '1.0b15' __author__ = 'Adrian Sampson ' import beets.library diff --git a/docs/changelog.rst b/docs/changelog.rst index cbf69f891..979093a94 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ Changelog ========= +1.0b15 (in development) +----------------------- + + +1.0b14 (May 12, 2012) +--------------------- + The centerpiece of this beets release is the graceful handling of similarly-named albums. It's now possible to import two albums with the same artist and title and to keep them from conflicting in the filesystem. Many other @@ -12,8 +19,6 @@ and a plugin for interoperability with other music library systems. A million thanks to the (growing) beets community for making this a huge release. -1.0b14 (May 12, 2012) ---------------------- * The importer now gives you **choices when duplicates are detected**. Previously, when beets found an existing album or item in your library matching the metadata on a newly-imported one, it would just skip the new diff --git a/docs/conf.py b/docs/conf.py index 65d81f4e5..e72c5c8dc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,8 +12,8 @@ master_doc = 'index' project = u'beets' copyright = u'2011, Adrian Sampson' -version = '1.0b14' -release = '1.0b14' +version = '1.0b15' +release = '1.0b15' pygments_style = 'sphinx' diff --git a/setup.py b/setup.py index a4e3dcfb7..df48b94aa 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ if 'sdist' in sys.argv: shutil.copytree(os.path.join(docdir, '_build', 'man'), mandir) setup(name='beets', - version='1.0b14', + version='1.0b15', description='music tagger and library organizer', author='Adrian Sampson', author_email='adrian@radbox.org',