Mercurial > hg > soundsoftware-site
diff lib/redmine/.svn/all-wcprops @ 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 | cd2282d2aa55 051f544170fe |
children | 753f1380d6bc |
line wrap: on
line diff
--- a/lib/redmine/.svn/all-wcprops Thu Jan 20 09:59:02 2011 +0000 +++ b/lib/redmine/.svn/all-wcprops Thu Mar 03 12:02:03 2011 +0000 @@ -1,19 +1,19 @@ K 25 svn:wc:ra_dav:version-url V 36 -/svn/!svn/ver/4688/trunk/lib/redmine +/svn/!svn/ver/4993/trunk/lib/redmine END i18n.rb K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/4516/trunk/lib/redmine/i18n.rb +/svn/!svn/ver/4894/trunk/lib/redmine/i18n.rb END pop3.rb K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/3330/trunk/lib/redmine/pop3.rb +/svn/!svn/ver/4737/trunk/lib/redmine/pop3.rb END safe_attributes.rb K 25 @@ -43,7 +43,7 @@ K 25 svn:wc:ra_dav:version-url V 47 -/svn/!svn/ver/4619/trunk/lib/redmine/version.rb +/svn/!svn/ver/4784/trunk/lib/redmine/version.rb END imap.rb K 25 @@ -63,36 +63,36 @@ V 44 /svn/!svn/ver/2776/trunk/lib/redmine/info.rb END +access_keys.rb +K 25 +svn:wc:ra_dav:version-url +V 51 +/svn/!svn/ver/1081/trunk/lib/redmine/access_keys.rb +END activity.rb K 25 svn:wc:ra_dav:version-url V 48 /svn/!svn/ver/1702/trunk/lib/redmine/activity.rb END -access_keys.rb -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/1081/trunk/lib/redmine/access_keys.rb -END wiki_formatting.rb K 25 svn:wc:ra_dav:version-url V 55 /svn/!svn/ver/3446/trunk/lib/redmine/wiki_formatting.rb END +menu_manager.rb +K 25 +svn:wc:ra_dav:version-url +V 52 +/svn/!svn/ver/4406/trunk/lib/redmine/menu_manager.rb +END plugin.rb K 25 svn:wc:ra_dav:version-url V 46 /svn/!svn/ver/4293/trunk/lib/redmine/plugin.rb END -menu_manager.rb -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/4406/trunk/lib/redmine/menu_manager.rb -END utils.rb K 25 svn:wc:ra_dav:version-url @@ -117,12 +117,24 @@ V 46 /svn/!svn/ver/3444/trunk/lib/redmine/search.rb END +configuration.rb +K 25 +svn:wc:ra_dav:version-url +V 53 +/svn/!svn/ver/4949/trunk/lib/redmine/configuration.rb +END core_ext.rb K 25 svn:wc:ra_dav:version-url V 48 /svn/!svn/ver/1361/trunk/lib/redmine/core_ext.rb END +ciphering.rb +K 25 +svn:wc:ra_dav:version-url +V 49 +/svn/!svn/ver/4950/trunk/lib/redmine/ciphering.rb +END about.rb K 25 svn:wc:ra_dav:version-url @@ -139,7 +151,7 @@ K 25 svn:wc:ra_dav:version-url V 52 -/svn/!svn/ver/3028/trunk/lib/redmine/unified_diff.rb +/svn/!svn/ver/4929/trunk/lib/redmine/unified_diff.rb END notifiable.rb K 25