From 5ae3e7a8d1e1ea57a5b4b0241b73dff0c10602eb Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 29 Oct 2014 17:59:21 +0000
Subject: [PATCH] Release 1.2.10

- YAbstractEloopTimerTask:
  - Renamed restart() to reset()
  - Add startTimer() and stopTimer()
  - Interpreted _timeout() return value YTASK_RETVAL_DEFAULT and
    YTASK_RETVAL_RELOOP equally

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 CHANGES | 8 ++++++++
 VERSION | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b80486be..5b08d5aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -446,3 +446,11 @@ Version 1.2.9
 -------------
 o reimplementation in YAbstractEloopTimerTask::_dump()
 o made YAbstractFamilyMember::setParent() virtual
+
+Version 1.2.10
+--------------
+o YAbstractEloopTimerTask:
+  - renamed restart() to reset()
+  - added startTimer() and stopTimer()
+  - interpreted _timeout() return value YTASK_RETVAL_DEFAULT and 
+    YTASK_RETVAL_RELOOP equally
diff --git a/VERSION b/VERSION
index 2263606b..8781eb7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.9-29-dev
+1.2.10-0-dev