[open-ils-commits] r10128 - in branches/acq-experiment: . Open-ILS/web/conify/global/config

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-07-25 10:55:26 -0400 (Fri, 25 Jul 2008)
New Revision: 10128

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/web/conify/global/config/marc_code_maps.html
Log:
Merged revisions 10125-10126 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r10125 | dbs | 2008-07-24 23:16:56 -0400 (Thu, 24 Jul 2008) | 2 lines
  
  Typo: Vidoe -> Video
........
  r10126 | miker | 2008-07-25 00:03:20 -0400 (Fri, 25 Jul 2008) | 1 line
  
  use MARC terminology
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-10124
   + /trunk:1-10127

Modified: branches/acq-experiment/Open-ILS/web/conify/global/config/marc_code_maps.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/conify/global/config/marc_code_maps.html	2008-07-25 14:55:15 UTC (rev 10127)
+++ branches/acq-experiment/Open-ILS/web/conify/global/config/marc_code_maps.html	2008-07-25 14:55:26 UTC (rev 10128)
@@ -392,7 +392,7 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Vidoe Recording Format Map">
+			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Videorecording Format Map">
 				<script type="dojo/connect" event="onShow">
 					if (!window.cvrfm_once) setTimeout("cvrfm_grid.render()",0);
 					window.cvrfm_once = 1;