<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>.gitignore</filename>
    </added>
    <added>
      <filename>things.todo</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,7 +2,7 @@
 ** For all documentation see the project website: http://www.ActiveScaffold.com **
 **********************************************************************************
 
-ActiveScaffold plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, and Tim Harper
+ActiveScaffold plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), and Ed Moss
 
 Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
 http://codinginparadise.org</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -67,9 +67,7 @@ module ActiveScaffold
         frontends_path = File.join(RAILS_ROOT, 'vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends')
 
         paths = self.active_scaffold_config.inherited_view_paths.clone 
-        ActionController::Base.view_paths.each do |dir|
-          paths &lt;&lt; File.join(dir,&quot;active_scaffold_overrides&quot;) if File.exists?(File.join(dir,&quot;active_scaffold_overrides&quot;))
-        end
+        paths &lt;&lt; File.join(RAILS_ROOT, 'app', 'views', 'active_scaffold_overrides')
         paths &lt;&lt; File.join(frontends_path, active_scaffold_config.frontend, 'views') if active_scaffold_config.frontend.to_sym != :default
         paths &lt;&lt; File.join(frontends_path, 'default', 'views')
         self.generic_view_paths = paths
@@ -138,4 +136,4 @@ module ActiveScaffold
       !active_scaffold_config.nil?
     end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>lib/active_scaffold.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>64539911b23f65a127ddd86869d0bbc8f4655cee</id>
    </parent>
  </parents>
  <author>
    <name>Edwin Moss</name>
    <email>edwin.moss@gmail.com</email>
  </author>
  <url>http://github.com/edwinmoss/active_scaffold/commit/4fc9bd435945077ebcd904bf9ce767804b764535</url>
  <id>4fc9bd435945077ebcd904bf9ce767804b764535</id>
  <committed-date>2008-06-06T19:25:04-07:00</committed-date>
  <authored-date>2008-06-06T19:25:04-07:00</authored-date>
  <message>Merge with coreteam.</message>
  <tree>cba1cd3b297bf8f363ef4188b39213b6262978eb</tree>
  <committer>
    <name>Edwin Moss</name>
    <email>edwin.moss@gmail.com</email>
  </committer>
</commit>
