From d761d0f2ea3c1cce015d3358b6dc3fe2a72b26d9 Mon Sep 17 00:00:00 2001
From: David Freese <w1hkj@w1hkj.com>
Date: Thu, 19 Jan 2012 19:22:27 -0600
Subject: [PATCH] Version 3.21.36

  Maintenance release
---
 ChangeLog    | 29 +++++++++++++++++++++++------
 configure.ac |  2 +-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06f0e93d..678e3276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,27 @@
-2012-01-04  David Freese  <w1hkj@w1hkj.com>
 
-	cec2d68: Text edit dnd
-	a81d7fe: Text top-bottom margins
-	771b006: Tune abort
-	e599539: Align warning
-	b35f245: FLTK-1.3 mods
+
+=Version 3.21.36=
+
+2012-01-19  David Freese  <w1hkj@w1hkj.com>
+
+	58af524: Macro load display
+	f49bce0: File-dir selection
+	29221f1: Rx text wrap
+	73d1349: UTF-8 rx suppress
+	5de45c0: Get WX
+	22e1f8b: Update to fltk.m4
+	56104f4: GCC-4.7 fixes
+	e7ab7e2: Missing files
+	3b02bb3: RX last line
+	6e81738: Debug text
+	0f87d87: View browser find control
+	b6a8332: Rx text wrap
+	f1abc9e: Find chars fwd/back
+	6102e0c: Corner controls
+	2281325: Fltk-1.3.0
+	847fdd3: Rig cat close
+	672f4ee: OpBrowser font
+	5f8b712: Tune abort
 
 
 =Version 3.21.35=
diff --git a/configure.ac b/configure.ac
index 6ff7a700..9d576a35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [21])
-m4_define(FLDIGI_PATCH, [.35])
+m4_define(FLDIGI_PATCH, [.36])
 m4_define(FLARQ_MAJOR,  [4])
 m4_define(FLARQ_MINOR,  [3])
 m4_define(FLARQ_PATCH,  [.2])