version 3.2.0

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14979]

2 files changed, 2 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index d7f103b..aa19bc1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,6 @@
 LOG:
-Version 3.1.2+edits (development branch) versus 3.1.2
+Version 3.2.0 versus 3.1.2
 - Added GPUWattch GPGPU power model based on McPAT 0.8beta. 
-- Bug Fixes:
-    - fix CUBIN parsing on Mac OS X
 
 Version 3.1.2 versus 3.1.1
 - Added support for CUDA 4.1 and 4.2 (PTX 3.0). 
diff --git a/version b/version
index dbf9323..d4cee46 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.1.2+edits (development branch) ";
+const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.2.0 ";
 const char *g_gpgpusim_build_string   =  "$Change$";