Mercurial > hg > soundsoftware-site
diff app/views/workflows/.svn/all-wcprops @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 753f1380d6bc |
children |
line wrap: on
line diff
--- a/app/views/workflows/.svn/all-wcprops Thu Jul 14 10:46:20 2011 +0100 +++ b/app/views/workflows/.svn/all-wcprops Thu Jul 14 10:50:53 2011 +0100 @@ -1,29 +1,5 @@ K 25 svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/3694/trunk/app/views/workflows +V 58 +/svn/!svn/ver/5878/branches/1.2-stable/app/views/workflows END -copy.rhtml -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/3154/trunk/app/views/workflows/copy.rhtml -END -_action_menu.rhtml -K 25 -svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/3154/trunk/app/views/workflows/_action_menu.rhtml -END -edit.rhtml -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/3694/trunk/app/views/workflows/edit.rhtml -END -index.rhtml -K 25 -svn:wc:ra_dav:version-url -V 56 -/svn/!svn/ver/3154/trunk/app/views/workflows/index.rhtml -END