From 2689b6b7bbeb2f84da287c15e8ab9b3d489e2912 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Fri, 4 Sep 2015 18:22:59 +0200
Subject: [PATCH] Prepare 1.3.10

---
 CHANGELOG             | 7 +++++++
 gns3server/version.py | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 41fbcbba..1a06415e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.3.10 04/09/2015
+
+* Catch exception when a process cannot be killed. Fixes #296.
+* Backport: fixes NAT NIO for Qemu VMs (do not launch any legacy scripts)
+* Fixes Unicode error. Fixes #290.
+* Don't delete Dynamips ROM files. They are used to restore the nvram.
+
 ## 1.3.9 03/08/2015
 
 * Backport: removes code that deletes IOS router instance files.
diff --git a/gns3server/version.py b/gns3server/version.py
index ff1480eb..1e77f1f4 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.3.10dev1"
-__version_info__ = (1, 3, 10, -99)
+__version__ = "1.3.10"
+__version_info__ = (1, 3, 10, 0)