From eab11f1ddfb804b6276a54808b11ba22b438a3bb Mon Sep 17 00:00:00 2001
From: Karl Lehenbauer <karl-gh@lehenbauer.com>
Date: Tue, 31 Jul 2012 16:00:55 -0500
Subject: [PATCH] * Update and tag for 1.3 release. BUGZID:

---
 ChangeLog    | 4 +++-
 README.md    | 2 +-
 configure.in | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce41f38..b04eb5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-<<<<<<< HEAD
+2012-07-31 karl
+    * Update and tag for 1.3 release.
+
 2012-07-06 karl
     * Comments.
 
diff --git a/README.md b/README.md
index 7ce0d73..87a7748 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ### This is yajl-tcl, a direct Tcl interface to the yajl JSON generator library.
 
-*Version 1.2*
+*Version 1.3*
 
 This package is a freely available open source package under the "Berkeley" license, same as Tcl.  You can do virtually anything you like with it, such as modifying it, redistributing it, and selling it either in whole or in part. See the file "license.terms" for complete information.
 
diff --git a/configure.in b/configure.in
index 44dc18f..2629ba1 100755
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([yajltcl], [1.2])
+AC_INIT([yajltcl], [1.3])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.