# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1626788654 -10800
# Node ID 36c9e3e31234bc052da32adf0a8a4030f4d582b0
# Parent  6b2827b1b81084272d7a1ff395b36521c50a3ac8# Parent  11e31df425607044abb9478379c37632663c3f68
Merge.

diff -r 6b2827b1b810 -r 36c9e3e31234 info.php
--- a/info.php	Tue Jul 20 16:43:59 2021 +0300
+++ b/info.php	Tue Jul 20 16:44:14 2021 +0300
@@ -139,7 +139,10 @@
         }
         else
         if ($nohits)
-          echo "<td class=\"nohits\" title=\"Not researched\">?</td>";
+        {
+          echo "<td class=\"nohits\" title=\"".
+          $mat1." + ".$mat2." = Not researched\">?</td>";
+        }
         else
           echo "<td class=\"nohits\"></td>";
 
diff -r 6b2827b1b810 -r 36c9e3e31234 instructions.php
--- a/instructions.php	Tue Jul 20 16:43:59 2021 +0300
+++ b/instructions.php	Tue Jul 20 16:44:14 2021 +0300
@@ -1,7 +1,7 @@
 <?
 require "mgeneric.inc.php";
 
-$pageCSS = "/css/docs4.css";
+$pageCSS = "/docs.css";
 $pageTitle = "Alloy combo information submission instructions";
 cmPrintPageHeader($pageTitle);