summaryrefslogtreecommitdiff
path: root/lib/psych.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-12-13 14:42:13 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-12-13 14:42:13 -0800
commitc2e0c9878416f621b23525870d69d2bc4816fceb (patch)
tree99ed847563b6be4b79f55a3839f9dc1d076a2384 /lib/psych.rb
parentd5757eaddab8aae701d8ab30c6d8d420e54db535 (diff)
parent978138b1d05ff6bdf3d04c601b9a05ef51090b51 (diff)
downloadpsych-c2e0c9878416f621b23525870d69d2bc4816fceb.zip
Merge branch 'embed'
* embed: fixing rsync make some header file adjustments for ruby compile updating the version to 2.0 add the license for libyaml fix c file name only do have_header checks if we are embedding libyaml mkmf has a global for this test fix build on windows only embed libyaml if the system does not have it for compiling on mswin embedding libyaml
Diffstat (limited to 'lib/psych.rb')
-rw-r--r--lib/psych.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/psych.rb b/lib/psych.rb
index ccbc7fe..d4a5171 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -95,7 +95,7 @@ require 'psych/handlers/document_stream'
module Psych
# The version is Psych you're using
- VERSION = '1.3.4'
+ VERSION = '2.0.0'
# The version of libyaml Psych is using
LIBYAML_VERSION = Psych.libyaml_version.join '.'