diff public/.svn/all-wcprops @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 851510f1b535
children
line wrap: on
line diff
--- a/public/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/public/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,47 +1,17 @@
 K 25
 svn:wc:ra_dav:version-url
-V 31
-/svn/!svn/ver/4377/trunk/public
-END
-dispatch.fcgi.example
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/2017/trunk/public/dispatch.fcgi.example
+V 45
+/svn/!svn/ver/6157/branches/1.2-stable/public
 END
 500.html
 K 25
 svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/419/trunk/public/500.html
+V 54
+/svn/!svn/ver/5878/branches/1.2-stable/public/500.html
 END
 404.html
 K 25
 svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/419/trunk/public/404.html
+V 54
+/svn/!svn/ver/5878/branches/1.2-stable/public/404.html
 END
-dispatch.cgi.example
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/2017/trunk/public/dispatch.cgi.example
-END
-.htaccess
-K 25
-svn:wc:ra_dav:version-url
-V 40
-/svn/!svn/ver/934/trunk/public/.htaccess
-END
-dispatch.rb.example
-K 25
-svn:wc:ra_dav:version-url
-V 51
-/svn/!svn/ver/2017/trunk/public/dispatch.rb.example
-END
-favicon.ico
-K 25
-svn:wc:ra_dav:version-url
-V 43
-/svn/!svn/ver/3845/trunk/public/favicon.ico
-END