From 08ec3343d0bca75e63e130266f75f8242f22050b Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Thu, 22 Nov 2012 14:26:54 -0800
Subject: CL 14572 is version 3.1.2

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14636]
---
 CHANGES | 2 +-
 version | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e9620e5..53fe165 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 LOG:
 
-Version 3.1.1+edits (development branch) versus 3.1.1
+Version 3.1.2 versus 3.1.1
 - Added support for CUDA 4.1 and 4.2 (PTX 3.0). 
 - Added an improved and less brittle support for associating fatbins to
   sections from the output of cuobjdump
diff --git a/version b/version
index ee29c39..dbf9323 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.1.1+edits (development branch) ";
+const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.1.2+edits (development branch) ";
 const char *g_gpgpusim_build_string   =  "$Change$"; 
-- 
cgit v1.3