Merge branch 'stable' into beta

Merging #674 into beta
Prepare the beta branch
2026-11-09 17:13:08 -10:00 · 2016-08-22 14:37:33 -07:00 · 2016-08-20 18:39:00 -07:00 · 2016-08-20 17:48:37 -07:00
4 changed files with 5 additions and 3 deletions
@@ -3,6 +3,8 @@
 This changelog only includes added major features and changes. Bugfixes and
 minor changes are omitted.

+## 3.1.0 (???)
+
 ## 3.0.1 (August 20 2016)

 A small bugfix release. There were a lot of references to the `master`-branch, however after 3.0.0 we use the names `stable`, `beta` and `dev` for our branches.
@@ -1,5 +1,5 @@
 # pwntools - CTF toolkit
-![pwntools logo](https://github.com/Gallopsled/pwntools/blob/stable/docs/source/logo.png?raw=true)
+![pwntools logo](https://github.com/Gallopsled/pwntools/blob/beta/docs/source/logo.png?raw=true)

 [![Docs](https://readthedocs.org/projects/pwntools/badge/?version=stable)](https://docs.pwntools.com/)
 [![PyPI](https://img.shields.io/pypi/v/pwntools.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.1.0beta0'
@@ -59,7 +59,7 @@ if not os.path.exists(PythonH):
 setup(
    name                 = 'pwntools',
    packages             = find_packages(),
-    version              = '3.0.1',
+    version              = '3.1.0beta0',
    data_files           = [('',
                             ['LICENSE-pwntools.txt',
                             ]),
Author	SHA1	Message	Date
Mathias Svensson	e877f7455a	Merge branch 'stable' into beta	2016-08-22 14:37:33 -07:00
Mathias Svensson	12b60447da	Merging #674 into beta	2016-08-20 18:39:00 -07:00
Mathias Svensson	2663762a9a	Prepare the beta branch	2016-08-20 17:48:37 -07:00