Merging my branch and d00ps branches to trunk

2010-01-22 07:43:29 +00:00
parent 8c55dd6c21
commit eeec43ebd7
119 changed files with 1137 additions and 1589 deletions
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -9,7 +9,7 @@
 						 {$version}
 					</if>
 					&copy; 2009-2010 by <a href="http://www.froxlor.org/" target="_blank">the Froxlor Team</a>
-					<br />Theme: Luca Piona and Luca Longinotti
+					<br />Theme based on work by: Luca Piona and Luca Longinotti
 					<if $lng['translator'] != ''>
 					<br />{$lng['panel']['translator']}: {$lng['translator']}
 					</if>