summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:38:38 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:38:38 +0000
commit5e45af463cca6f062a986d5e686350e17ea653bb (patch)
tree17e8b758eaee27fa3a69598b2a32e96318cffe8b /version.h
parent7c9a4b2f0abea9754c4a26da65f76561f81da08f (diff)
merge revision(s) 37585,37587,37591,37592,37597,37599:
* random.c (rb_memhash): use siphash. * siphash.c (sip_init_state): use union to suppress warnings by gcc 4.7. * siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined. * siphash.h: check configure macros before include newer headers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index 143f4089cc..e714b08139 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 325
+#define RUBY_PATCHLEVEL 326
#define RUBY_RELEASE_DATE "2012-11-10"
#define RUBY_RELEASE_YEAR 2012