Merge branch 'v2-stable' into beta

Conflicts:

	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2010-02-22 11:07:08 +01:00
commit fdf23a1c94

View File

@ -67,7 +67,7 @@ $LANG = "en"; // Default language
// Default Template vars
$content['BUILDNUMBER'] = "3.0.0";
$content['UPDATEURL'] = "http://www.phplogcon.org/updatecheck/version.txt";
$content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt";
$content['TITLE'] = "LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title
$content['BASEPATH'] = $gl_root_path;
$content['SHOW_DONATEBUTTON'] = true; // Default = true!