Merge remote-tracking branch 'refs/remotes/origin/master' into Dev

HVSoftware · Sep 24, 2017 · 56eca3d · 56eca3d
2 parents f1a0287 + 3d739f9
commit 56eca3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/histo.txt b/histo.txt
@@ -5,7 +5,7 @@ v1.6 - /09/2017 :
      - De-select a light now correctly remove 'checked' display on all related multi-selections
      - Don't display 'LightSource' groups (already included into 'Luminaire' groups)
 WIP	 - Display now color and brightness of a lamp in details tab even if turned off
-WIP  - Lights details tab display now always immediately changes for color or brightness
+WIP  - Lights details tab now always displays changes immediately for color or brightness
 v1.5 - 11/09/2016 : 
 	 - Add Sensors Rules management
 	 - Update color conversion with new formulas from meethue

diff --git a/include/about.php b/include/about.php
@@ -18,7 +18,7 @@
 <H3><?php echo $trs['Histo']?></H3>
 <DIV>
 <?php
-$histo = @file("HISTO.txt");
+$histo = @file("histo.txt");
 foreach ($histo as $num => $line){
 	$line = preg_replace("/^(v.*) - /","<B>$1</B> - ",$line);
 	echo "$line<BR>\n";