Permalink
Browse files

Closing out merge conflicts

  • Loading branch information...
2 parents 9962a36 + b93134f commit 306b3bd20dcadfe8d90cd157b7305bd355449b82 @pedersen pedersen committed Jun 27, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −2 book/conf.py
  2. +2 −2 book/setup.cfg
  3. +2 −2 book/setup.py
View
4 book/conf.py
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = '2.1.5'
+version = '2.2'
# The full version, including alpha/beta/rc tags.
-release = '2.1.5'
+release = '2.2.0rc2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
4 book/setup.cfg
@@ -1,8 +1,8 @@
[aliases]
# A handy alias to make a release to pypi
release = egg_info -RDb "" sdist bdist_egg register upload
-tgdevelop = develop -i http://tg.gy/current
-tgdeps = easy_install -i http://tg.gy/current AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
+tgdevelop = develop -i http://tg.gy/220rc2
+tgdeps = easy_install -i http://tg.gy/220rc2 AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
[egg_info]
#tag_build = dev
View
4 book/setup.py
@@ -2,7 +2,7 @@
setup(
name='TurboGears2Docs',
- version='2.2.0rc1',
+ version='2.2.0rc2',
author='TurboGears Community',
url='http://www.turbogears.org/',
license='MIT',
@@ -15,6 +15,6 @@
'dulwich',
],
dependency_links=[
- "http://tg.gy/beta"
+ "http://tg.gy/220rc2/"
]
)

0 comments on commit 306b3bd

Please sign in to comment.