From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 9 Feb 2009 10:46:01 +0000 (+0000)
Subject: Checking in changes prior to tagging of version 1.101.  Changelog diff is:
X-Git-Tag: 1.102~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b064d5c4698236b212baa360233710b5fd7bbe6b;hp=ab06aecedf5ace534b8a3c40a198518d6f308755;p=catagits%2FCatalyst-View-ContentNegotiation-XHTML.git

Checking in changes prior to tagging of version 1.101.  Changelog diff is:

Index: Changes
===================================================================
--- Changes	(revision 9270)
+++ Changes	(working copy)
@@ -1,3 +1,5 @@
+1.101
+  - Fix dependencies in Makefile.PL, merge fail :/
 1.100
   - Refactor into a Moose Role for use with alternate views. (rafl)
   - Additional documentation (t0m)
---

diff --git a/Changes b/Changes
index a63c95c..193e5fb 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+1.101
+  - Fix dependencies in Makefile.PL, merge fail :/
 1.100
   - Refactor into a Moose Role for use with alternate views. (rafl)
   - Additional documentation (t0m)
diff --git a/Makefile.PL b/Makefile.PL
index d6c1f7b..2666861 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,6 +7,8 @@ requires 'Catalyst::Runtime';
 requires 'Catalyst::View::TT';
 requires 'HTTP::Negotiate';
 requires 'MRO::Compat';
+requires 'MooseX::Types::Structured';
+requires 'MooseX::Types::Moose';
 
 test_requires 'Catalyst::Action::RenderView';
 test_requires 'Test::WWW::Mechanize::Catalyst';
diff --git a/lib/Catalyst/View/ContentNegotiation/XHTML.pm b/lib/Catalyst/View/ContentNegotiation/XHTML.pm
index 256804f..5ad775e 100644
--- a/lib/Catalyst/View/ContentNegotiation/XHTML.pm
+++ b/lib/Catalyst/View/ContentNegotiation/XHTML.pm
@@ -8,7 +8,7 @@ use HTTP::Negotiate qw/choose/;
 use namespace::clean -except => 'meta';
 
 # Remember to bump $VERSION in View::TT::XHTML also.
-our $VERSION = '1.100';
+our $VERSION = '1.101';
 
 requires 'process';