Merge branch 'stable' into beta

Merge remote-tracking branch 'upstream/stable' into beta
2026-11-11 02:02:17 -10:00 · 2016-09-19 23:07:53 +02:00 · 2016-09-19 13:10:34 -07:00 · 2016-09-19 00:28:50 +02:00 · 2016-09-18 22:31:34 +02:00 · 2016-09-18 21:35:21 +02:00
3 changed files with 8 additions and 2 deletions
@@ -3,6 +3,12 @@
 This changelog only includes added major features and changes. Bugfixes and
 minor changes are omitted.

+## 3.1.0 (October 1, 2016)
+
+**Currently on the _beta_ branch**
+
+A number of smaller bugfixes and documentation tweaks.
+
 ## 3.0.4 (September 19, 2016)

 **Current release**
@@ -1 +1 @@
-__version__ = '3.0.4'
+__version__ = '3.1.0beta3'
@@ -75,7 +75,7 @@ except ImportError:
 setup(
    name                 = 'pwntools',
    packages             = find_packages(),
-    version              = '3.0.4',
+    version              = '3.1.0beta3',
    data_files           = [('',
                             glob.glob('*.md') + glob.glob('*.txt')),
                            ],
Author	SHA1	Message	Date
Mathias Svensson	9cca9c989b	Merge branch 'stable' into beta	2016-09-19 23:07:53 +02:00
Zach Riggle	dacdd397ab	Merge remote-tracking branch 'upstream/stable' into beta	2016-09-19 13:10:34 -07:00
Mathias Svensson	254958bae9	Merge branch 'stable' into beta	2016-09-19 00:28:50 +02:00
Mathias Svensson	6ebcc6f3a2	Merge branch 'stable' into beta	2016-09-18 22:31:34 +02:00
Mathias Svensson	89fc74facf	Merge branch 'stable' into beta	2016-09-18 21:35:21 +02:00
Mathias Svensson	5fe024838b	Release 3.1.0beta1	2016-09-06 11:36:27 -10:00
Mathias Svensson	b60103b839	Merge branch 'stable' into beta	2016-09-06 11:30:58 -10:00
Mathias Svensson	a5c2b9276a	Merge branch 'stable' into beta	2016-09-06 10:07:33 -10:00
Mathias Svensson	efaea581a1	Merge branch 'stable' into beta	2016-08-24 20:04:06 -07:00
Mathias Svensson	300ef0b462	Merge branch 'Idolf-beta-changelog' into beta	2016-08-24 14:20:02 -07:00
Mathias Svensson	6e79272e8d	Updated the changelog	2016-08-24 14:17:46 -07:00
Mathias Svensson	e4c2a48696	Merge pull request #679 from Gallopsled/stable Even more documentation (#678)	2016-08-22 15:22:39 -07:00
Mathias Svensson	abd08a94ea	Fixed the logo path to be closer to stable	2016-08-22 14:48:26 -07:00
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