From cb32223a6ac2d6cc16666a6a7056dfcbf2c9ddf2 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sun, 7 Apr 2013 15:27:37 +0000
Subject: [PATCH] preparing release 2.6.1

---
 bochs/CHANGES                    | 2 +-
 bochs/README                     | 4 ++--
 bochs/build/win32/bochs.manifest | 2 +-
 bochs/configure.in               | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bochs/CHANGES b/bochs/CHANGES
index 571c7091c..a71a9b1db 100644
--- a/bochs/CHANGES
+++ b/bochs/CHANGES
@@ -1,4 +1,4 @@
-Changes in 2.6.1 (not released yet):
+Changes in 2.6.1 (April 7, 2013):
 
 - CPU / CPUDB
   - Bochs is fully aligned with rev45 of the of Intel(R) Architecture Manual.
diff --git a/bochs/README b/bochs/README
index c1c53fa80..615a9f973 100644
--- a/bochs/README
+++ b/bochs/README
@@ -1,6 +1,6 @@
 Bochs - The cross platform IA-32 (x86) emulator
-Updated: Sun Sep  2 13:10:00 CEST 2012
-Version: 2.6
+Updated: Sun Apr  7 17:27:00 CEST 2013
+Version: 2.6.1
 
 WHAT IS BOCHS?
 
diff --git a/bochs/build/win32/bochs.manifest b/bochs/build/win32/bochs.manifest
index 8ef802d09..ff89659e4 100644
--- a/bochs/build/win32/bochs.manifest
+++ b/bochs/build/win32/bochs.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    version="2.6.0.0"
+    version="2.6.1.0"
     processorArchitecture="*"
     name="Bochs.Bochs.Bochs"
     type="win32"
diff --git a/bochs/configure.in b/bochs/configure.in
index 9f24d29bc..a312d2a97 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -8,13 +8,13 @@ AC_CONFIG_HEADER(ltdlconf.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.6.svn"
-VER_STRING="2.6.svn"
+VERSION="2.6.1"
+VER_STRING="2.6.1"
 dnl // WIN_VER_STRING format is "a, b, c, d"
 dnl // c should be > 90 for pre-release of next version otherwise patch level
 dnl // d should be 0 for release and 1 for svn version
-WIN_VER_STRING="2, 6, 0, 1"
-REL_STRING="Built from SVN snapshot after release 2.6"
+WIN_VER_STRING="2, 6, 1, 0"
+REL_STRING="Built from SVN snapshot on April 7, 2013"
 
 changequote(<<, >>)
 changequote([, ])