From af672548bdc460ae491b169da6e6b42c0868ff29 Mon Sep 17 00:00:00 2001
From: shingara <cyril.mougel@gmail.com>
Date: Tue, 18 Nov 2008 18:45:17 +0100
Subject: [PATCH] prepare release v0.6.0

---
 History.txt              | 2 +-
 Manifest.txt             | 6 ++++++
 lib/pictrails/version.rb | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/History.txt b/History.txt
index 7e77327..f8f9d3d 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,4 @@
-== Master
+== 0.6.0 / 2008-11-18
 
 * Choose the front picture of gallery
 * Choose a random front picture of gallery
diff --git a/Manifest.txt b/Manifest.txt
index a8d6112..40b27a0 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -46,8 +46,12 @@ app/views/admin/galleries/follow_import.js.rjs
 app/views/admin/galleries/index.html.erb
 app/views/admin/galleries/new.html.erb
 app/views/admin/galleries/new_by_mass_upload.html.erb
+app/views/admin/galleries/random_front_picture.js.rjs
 app/views/admin/galleries/show.html.erb
+app/views/admin/pictures/_copy_form.html.erb
 app/views/admin/pictures/_picture.html.erb
+app/views/admin/pictures/copy.html.erb
+app/views/admin/pictures/copy.js.rjs
 app/views/admin/pictures/edit.html.erb
 app/views/admin/pictures/index.html.erb
 app/views/admin/pictures/new.html.erb
@@ -98,6 +102,7 @@ db/migrate/20080618220812_acts_as_taggable_migration.rb
 db/migrate/20080824170446_add_picture_id_in_import.rb
 db/migrate/20080910173454_create_comments.rb
 db/migrate/20081004162418_create_view_picture.rb
+db/migrate/20081009062522_add_default_picture_to_gallery.rb
 db/schema.rb
 lib/authenticated_system.rb
 lib/authenticated_test_helper.rb
@@ -151,6 +156,7 @@ public/images/user.png
 public/images/user50.png
 public/images/world_link.png
 public/images/world_link50.png
+public/javascripts/administration.js
 public/javascripts/application.js
 public/javascripts/controls.js
 public/javascripts/dragdrop.js
diff --git a/lib/pictrails/version.rb b/lib/pictrails/version.rb
index 1dfa3eb..6ad2abe 100644
--- a/lib/pictrails/version.rb
+++ b/lib/pictrails/version.rb
@@ -1,8 +1,8 @@
 module Pictrails
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 5
-    TINY  = 2
+    MINOR = 6
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end