From 9d1971cab8e40da9f221e940284e17cedc740019 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 26 Jan 2014 14:03:22 +0100
Subject: [PATCH] Prepare for 1.0.0 release

---
 Changelog.md          | 6 ++++++
 lib/naught/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3421756..352617d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+## 1.0.0
+
+  - [Replace `::BasicObject` with `Naught::BasicObject`](https://github.com/avdi/naught/commit/8defad0bf9eb65e33054bf0a6e9c625c87c3e6df)
+  - [Delegate explicit conversions to nil instead of defining them explicitly](https://github.com/avdi/naught/commit/85c195de80ed56993b88f47e09112c903a92a167)
+  - Add support for (and run tests on) Ruby 1.8, 1.9, 2.0, 2.1, JRuby, and Rubinius
+
 ## 0.0.3
 
 Features:
diff --git a/lib/naught/version.rb b/lib/naught/version.rb
index 311408d..c2efe33 100644
--- a/lib/naught/version.rb
+++ b/lib/naught/version.rb
@@ -1,3 +1,3 @@
 module Naught
-  VERSION = '0.0.3'
+  VERSION = '1.0.0'
 end