This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 506f655f448cc8a6a6db92c00937c5651afa9143 (commit)
via d55d57d5e7ef7f53d59ef7639d5a25ab8e05fc76 (commit)
via 9793cb5101e1d3d1da20eab9e9c11130d07dc159 (commit)
via 69ca3d1c411814f0ec6fe85ec5d329e3037bede5 (commit)
via 8334f2223233ebbb9d0090a738a1f0491240b1b1 (commit)
via bad1652369eca6643f9415d0c7dc383552860141 (commit)
via 12c3551fed18bed9547e5752c1ec947687949214 (commit)
via e0c9f7b68ed63134b77697269c7f293afe8b1e50 (commit)
via be6f14d1c5aa9508a2aa6659de73f577d00ebbec (commit)
via 4cca94c9db5d53bab6993a1e821509e3be06b86b (commit)
via 95f84ed7b2b6c110a202d1db4a8fb103312be269 (commit)
from d778872a8054342c793d9612e8883c40ba7564c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/506f655f448cc8a6a6db92c00937c5651afa9143
commit 506f655f448cc8a6a6db92c00937c5651afa9143
Merge: d778872 d55d57d
Author: Oleg Broytman <ph...@ph...>
Date: Thu Dec 18 20:05:10 2014 +0300
Merge branch '2.0'
diff --cc docs/DeveloperGuide.txt
index 8515824,ce1567f..0182c99
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@@ -180,8 -180,8 +180,8 @@@ exercised, even if the tests are absolu
We now use Travis CI to run tests. See the status:
-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=2.0
+.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
- :target: https://travis-ci.org/sqlobject/sqlobject
+ :target: https://travis-ci.org/sqlobject/sqlobject
Documentation
=============
diff --cc setup.py
index 8496604,baad939..fefdb43
--- a/setup.py
+++ b/setup.py
@@@ -55,11 -57,11 +57,11 @@@ For development see the projects a
`SourceForge <http://sourceforge.net/projects/sqlobject/>`_
and `GitHub <https://github.com/sqlobject>`_.
-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=2.0
+.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
- :target: https://travis-ci.org/sqlobject/sqlobject
+ :target: https://travis-ci.org/sqlobject/sqlobject
""",
classifiers=[
- "Development Status :: 4 - Beta",
+ "Development Status :: 1 - Planning",
"Intended Audience :: Developers",
"License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
"Programming Language :: Python",
-----------------------------------------------------------------------
Summary of changes:
docs/DeveloperGuide.txt | 2 +-
docs/News.txt | 23 +++++++++++++++++++++++
setup.py | 31 ++++++++++++++++++++++++++++---
3 files changed, 52 insertions(+), 4 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
