[geeklog-cvs] Translator mergeversions,1.4,1.5

[tony at iowaoutdoors.org]

Update of /var/cvs/Translator
In directory www:/tmp/cvs-serv30585

Modified Files:
	mergeversions 
Log Message:
Forgot to uncomment some code

Index: mergeversions
===================================================================
RCS file: /var/cvs/Translator/mergeversions,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mergeversions	12 Aug 2004 20:35:46 -0000	1.4
--- mergeversions	12 Aug 2004 20:36:21 -0000	1.5
***************
*** 410,417 ****
  // To avoid having to send translators multiple files we include the main command line code
  // here instead of doing a require_once in a separate file.
! //$argArray = array();
  
  // Parse arguments
! /*foreach ($argv as $curArg) {
      $tmpArray = array();
      if (strstr($curArg,'=')) {
--- 410,417 ----
  // To avoid having to send translators multiple files we include the main command line code
  // here instead of doing a require_once in a separate file.
! $argArray = array();
  
  // Parse arguments
! foreach ($argv as $curArg) {
      $tmpArray = array();
      if (strstr($curArg,'=')) {
***************
*** 419,423 ****
          $argArray[strtolower($tmpArray[0])] = $tmpArray[1];
      }
! }*/
  
  // Perform the merge
--- 419,423 ----
          $argArray[strtolower($tmpArray[0])] = $tmpArray[1];
      }
! }
  
  // Perform the merge