diff src/compiler.sml @ 1979:81bc76aa4acd

Merge in upstream changes.
author Patrick Hurst <phurst@mit.edu>
date Sat, 18 Jan 2014 18:26:24 -0500
parents ac1be85e91ad
children 0652f295e0fa
line wrap: on
line diff
--- a/src/compiler.sml	Mon Dec 09 20:41:24 2013 -0500
+++ b/src/compiler.sml	Sat Jan 18 18:26:24 2014 -0500
@@ -864,6 +864,8 @@
                                    | "alwaysInline" => Settings.addAlwaysInline arg
                                    | "noXsrfProtection" => Settings.addNoXsrfProtection arg
                                    | "timeFormat" => Settings.setTimeFormat arg
+                                   | "noMangleSql" => Settings.setMangleSql false
+                                   | "html5" => Settings.setIsHtml5 true
 
                                    | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
                                  read ()