Merge pull request #256 from whirm/release-6.2.0

release 6.2.0
Tribler · Jul 31, 2013 · cb7d87f · cb7d87f
2 parents c1d3569 + 2ea7c29
commit cb7d87f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/Tribler/Core/__init__.py b/Tribler/Core/__init__.py
@@ -13,7 +13,7 @@
 from Tribler.__init__ import LIBRARYNAME
 
 if LIBRARYNAME == "Tribler":
-    version_id = '6.2.0-rc3'
+    version_id = '6.2.0'
     product_name = 'Tribler'
     version_short = 'Tribler-' + version_id
     report_email = 'tribler@tribler.org'

diff --git a/Tribler/Main/Build/Win32/tribler.nsi b/Tribler/Main/Build/Win32/tribler.nsi
@@ -1,5 +1,5 @@
 !define PRODUCT "Tribler"
-!define VERSION "6.2.0-rc3"
+!define VERSION "6.2.0"
 
 !include "MUI.nsh"
 !include "UAC.nsh"

diff --git a/debian/changelog b/debian/changelog
@@ -1,22 +1,8 @@
-tribler (6.2.0-rc3) unstable; urgency=low
+tribler (6.2.0) unstable; urgency=low
 
-  * New release candidate
+  * New release.
 
- -- Elric Milon <e.milon@tudelft.nl>  Thu, 25 Jul 2013 12:26:13 +0200
-
-tribler (6.2.0-rc2) unstable; urgency=low
-
-  [ Elric Milon ]
-  * New release candidate
-
- -- whirm <whirm@screw>  Tue, 23 Jul 2013 18:20:41 +0200
-
-tribler (6.2.0-rc1) unstable; urgency=low
-
-  [ Elric Milon ]
-  * New upstream release. 
-
- -- Elric Milon <e.milon@tudelft.nl>  Tue, 16 Jul 2013 13:49:25 +0200
+ -- Elric Milon <e.milon@tudelft.nl>  Wed, 31 Jul 2013 12:31:24 +0200
 
 tribler (6.0.0+svn20121015.r28821-1) unstable; urgency=low