[Debian-sf-commits] Commit info

[Roland Mas <address@hidden>]

sourceforge/www/include vote_function.php,1.3 user_home.php,1.3 theme.php,1.5 
squal_pre.php,1.3 project_home.php,1.3 pre.php,1.3 osdn.php,1.5 menu.php,1.3 
html.php,1.3 frs.class,1.4 features_boxes.php,1.3 cache.php,1.3 Theme.class,1.3 
Layout.class,1.3

Fri Nov  2 15:21:19 UTC 2001

Update of /cvsroot/debian-sf/sourceforge/www/include
In directory subversions:/tmp/cvs-serv6995

Modified Files:
        vote_function.php user_home.php theme.php squal_pre.php 
        project_home.php pre.php osdn.php menu.php html.php frs.class 
        features_boxes.php cache.php Theme.class Layout.class 
Log Message:
Solved conflicts arising from 2.6 import/merge.