Author: nikrou
Date: Thu Jun 22 21:21:56 2006
New Revision: 1377

URL: http://svn.gna.org/viewcvs/phpwebgallery?rev=1377&view=rev
Log:
svn merge -r1366:1371 from branch 1.6 into trunk

Added:
    trunk/include/menubar.inc.php
      - copied unchanged from r1371, branches/branch-1_6/include/menubar.inc.php
    trunk/template/yoga/menubar.tpl
      - copied unchanged from r1371, 
branches/branch-1_6/template/yoga/menubar.tpl
Modified:
    trunk/include/common.inc.php
    trunk/include/config_default.inc.php
    trunk/index.php
    trunk/template/yoga/header.tpl
    trunk/template/yoga/index.tpl
    trunk/template/yoga/theme/clear/themeconf.inc.php
    trunk/template/yoga/theme/dark/themeconf.inc.php


_______________________________________________
Phpwebgallery-cvs mailing list
Phpwebgallery-cvs@gna.org
https://mail.gna.org/listinfo/phpwebgallery-cvs

Reply via email to