fix merge

2012-01-25 13:45:28 -05:00
parent 5eab8ba70b c1543c7f49
commit 7adda62fc7
31 changed files with 3324 additions and 318 deletions
--- a/main.html
+++ b/main.html
@@ -17,6 +17,10 @@
  <script type="text/javascript" src="/static/js/schematic.js"></script>
  <script type="text/javascript" src="/static/js/cktsim.js"></script>

+  <!--[if lt IE 9]>
+  <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
  <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
  <script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
  <link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">