Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CT2JAY 2017-03-05 17:17:45 +00:00
commit 6b6bd23375
2 changed files with 9 additions and 1 deletions

View file

@ -101,6 +101,14 @@ checkSetup();
// Here you can feel free to disable info-sections by commenting out with // before include
include "include/txinfo.php";
showLapTime("txinfo");
if (!defined("SHOWCPU") AND !defined("SHOWDISK") AND !defined("SHOWRPTINFO") AND !defined("SHOWMODES") AND !defined("SHOWLH") AND !defined("SHOWLOCALTX")) {
define("SHOWCPU", "on");
define("SHOWDISK", "on");
define("SHOWRPTINFO", "on");
define("SHOWMODES", "on");
define("SHOWLH", "on");
define("SHOWLOCALTX", "on");
}
if (defined("SHOWCPU")) {
include "include/sysinfo_ajax.php";
showLapTime("sysinfo");

View file

@ -1,3 +1,3 @@
<?php
define("VERSION", "20170302-1");
define("VERSION", "20170304-1");
?>