Prepare the beta branch

Gallopsled · Aug 21, 2016 · 2663762 · 2663762
1 parent 7aa9605
commit 2663762
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 This changelog only includes added major features and changes. Bugfixes and
 minor changes are omitted.
 
+## 3.1.0 (???)
+
 ## 3.0.0 (August 20 2016)
 
 This was a large release (1305 commits since 2.2.0) with a lot of bugfixes and changes.  The Binjitsu project, a fork of Pwntools, was merged back into Pwntools.  As such, its features are now available here.

diff --git a/pwnlib/version.py b/pwnlib/version.py
@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = '3.1.0-beta'
diff --git a/setup.py b/setup.py
@@ -59,7 +59,7 @@
 setup(
     name                 = 'pwntools',
     packages             = find_packages(),
-    version              = '3.0.0',
+    version              = '3.1.0-beta',
     data_files           = [('',
                              ['LICENSE-pwntools.txt',
                              ]),