From ef771cf4c449e2d7247c0c4ecf3afe453ee48fba Mon Sep 17 00:00:00 2001
From: Nate Bargmann <n0nb@n0nb.us>
Date: Wed, 13 Jul 2011 21:57:07 -0500
Subject: [PATCH] Updates for 1.2.14 release

---
 AUTHORS        | 17 ++++++++++++++++-
 NEWS           | 14 ++++++++++----
 README.release |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ac9ddde39..780ac1bf7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -96,6 +96,7 @@ C: Leigh Klotz, WA5ZNU
 
 [kenwood: K3]
 M: Nate Bargmann, N0NB
+C: Alexander Sack
 
 [kenwood: TS-480SAT]
 M: Juergen Rinas, DC3BW
@@ -238,6 +239,9 @@ C: Ron Patterson, W6FM
 M: Stephane Fillod, F8CFE
 C: Chris Bryant, G3WIE
 
+[ts7400]
+M: Øystein Hårberg, LA7LKA
+
 [Frontend]
 M: Stephane Fillod, F8CFE
 
@@ -247,6 +251,12 @@ C: Stephane Fillod, F8CFE
 C: Nate Bargmann, N0NB
 
 
+[test utilities]
+M: Stephane Fillod, F8CFE
+C: Nate Bargmann, N0NB
+C: Nirgal Vourgère
+
+
 [platform: FreeBSD]
 M: Diane Bruce, VA3DB
 
@@ -268,9 +278,10 @@ M: Alexandru Csete, OZ9AEC
 M: Joop Stakenborg, PG4I
 
 
-[Web site: http://hamlib.sf.net]
+[Web site: http://www.hamlib.org]
 M: Joop Stakenborg, PG4I
 M: Stephane Fillod, F8CFE
+M: Nate Bargmann, N0NB
 
 
 E-mail addresses:
@@ -321,3 +332,7 @@ Kamal Mostafa, KA6MAL, <kamal (at) whence.com>
 Roger, <roger-linux (at) users.sourceforge.net>
 Tristan Mills, <t_mills (at) users.sourceforge.net>
 Terry Dawson, VK2KTJ, <terry (at) users.sourceforge.net>
+Øystein Hårberg, LA7LKA, <oystein.haarberg (at) netrunner.nu>
+Alexander Sack <pisymbol (at) gmail.com>
+Nirgal Vourgère <contact_hamlib (at) nirgal.com>
+
diff --git a/NEWS b/NEWS
index 4e7f03e7d..cb0c773eb 100644
--- a/NEWS
+++ b/NEWS
@@ -6,10 +6,16 @@ Copyright (C) 2000-2011  Stephane Fillod, and others
 Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
 
 Version 1.2.14
-	2011-XX-XX
-	* New models: SigFox Transfox, TH-D72A, IC-7410, IC-9100
-	* New rotator backends: IF-100
-	* Fixes and features: K3
+	2011-08-01
+	* New models: SigFox Transfox, TH-D72A, IC-7410, IC-9100, IC-R9500, KX3,
+		V4L2 API support (untested),
+	* New rotator backends: IF-100, TS-7400
+	* Fixes and features: K3/KX3, Build Win32 from script, rigctld/rotctld
+		ported to Mingw32, Win32 build fixes, remove obsolete bundled
+		libtool files, rigctl improvements, FUNcube string test (works
+		with V0.0 and V1.0), Yaesu newcat.c fixed to use
+		rig->state.current_vfo to store vfo value, add a command to
+		halt rigctld,
 
 Version 1.2.13.1
 	* 2011-05-29
diff --git a/README.release b/README.release
index 9553f047d..8e0c4fa60 100644
--- a/README.release
+++ b/README.release
@@ -60,7 +60,7 @@ remote repository, "origin"):
 
 * Push the changes (check for validity):
   git push origin       # pushes previous commit to sf.net repository
-  git push origin Hamlib-1.2.14         # push the branch
+  git push -u origin Hamlib-1.2.14         # push the branch and set "upstream"
 
 * Update the version in the macro AC_INIT of configure.ac (advance to next
   version, e.g. 1.2.15~git) and the libhamlib_la_LDFLAGS value in