Mercurial > hip
diff hip.html @ 19:4f03bdb9ac5b
Merged?
author | jonathandicarlo@jonathan-dicarlos-macbook-pro.local |
---|---|
date | Tue, 15 Jul 2008 14:20:04 -0700 |
parents | 5fce4c8f3ebd e4c22ff801f9 |
children | 44550b8fd922 |
line wrap: on
line diff
--- a/hip.html Tue Jul 15 14:10:17 2008 -0700 +++ b/hip.html Tue Jul 15 14:20:04 2008 -0700 @@ -1,13 +1,12 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" media="all" href="hip.css" /> -<title></title> +<title>HIP</title> </head> <body> +<script>alert('blah');</script> <div id="status-line">Blah!</div> <input id="search-box" type="text" size="40" /> <div id="autocomplete-popup"></div> @@ -23,7 +22,6 @@ <p>japanese</p> <p>opera</p> <p>mexico city</p> -</body> <script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="date.js"></script> <script type="text/javascript" src="nounClasses.js"></script> @@ -32,4 +30,5 @@ <script type="text/javascript" src="verbs.js"></script> <script type="text/javascript" src="querySource.js"></script> <script type="text/javascript" src="hip.js"></script> +</body> </html>