[Wonder-cvs] SF.net SVN: wonder:[8906] branches/Wonder_2_0_0_WebObjects_5_4_Branch/ Wonder/

[<bob...@us...>]

Revision: 8906
          http://wonder.svn.sourceforge.net/wonder/?rev=8906&view=rev
Author:   bob_schwarzmann
Date:     2009-02-06 00:19:09 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
Merged revisions 8902,8905 via svnmerge from 
https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_2_0_0_Branch/Wonder

........
  r8902 | tcripps | 2009-02-04 15:51:01 -0800 (Wed, 04 Feb 2009) | 1 line
  
  Added rule to prevent banner from showing when no bannerFileName is available.
........
  r8905 | tcripps | 2009-02-05 11:15:27 -0800 (Thu, 05 Feb 2009) | 1 line
  
  Removing the bannerFileName rule, as it didn't work as intended.
........

Property Changed:
----------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/Wonder_2_0_0_Branch/Wonder:1-8900
   + /branches/Wonder_2_0_0_Branch/Wonder:1-8905
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder:8813,8828-8900
   + /branches/Wonder_2_0_0_Branch/Wonder:8813,8828-8900,8902-8905


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.