Mercurial > hg > soundsoftware-site

diff app/views/.svn/entries @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author: Chris Cannam
date: Thu, 03 Mar 2011 12:02:03 +0000
parents: 5e974759e8b2 051f544170fe
children: 753f1380d6bc
--- a/app/views/.svn/entries	Thu Jan 20 09:59:02 2011 +0000
+++ b/app/views/.svn/entries	Thu Mar 03 12:02:03 2011 +0000
@@ -1,15 +1,15 @@
 10
 
 dir
-4732
+4993
 http://redmine.rubyforge.org/svn/trunk/app/views
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-16T16:36:58.753919Z
-4731
-jplang
+2011-03-01T10:27:51.597350Z
+4983
+tmaruyama
 
 
 
@@ -38,52 +38,52 @@
 members
 dir
 
-welcome
+context_menus
 dir
 
-context_menus
+welcome
 dir
 
 journals
 dir
 
+time_entry_reports
+dir
+
 workflows
 dir
 
-time_entry_reports
-dir
-
 reports
 dir
 
-timelog
-dir
-
-settings
-dir
-
 layouts
 dir
 
 custom_fields
 dir
 
-issue_moves
+settings
+dir
+
+timelog
 dir
 
 users
 dir
 
+issue_moves
+dir
+
 files
 dir
 
 previews
 dir
 
-auth_sources
+ldap_auth_sources
 dir
 
-ldap_auth_sources
+auth_sources
 dir
 
 search
@@ -92,10 +92,10 @@
 messages
 dir
 
-versions
+issue_relations
 dir
 
-issue_relations
+versions
 dir
 
 mailer