Merge branch 'master' of git://github.com/trebonian/visual6502

Conflicts:

	segdefs.js

transdefs.js

@@ -1,3 +1,14 @@
+/*
+ Copyright (c) 2010 Greg James, Brian Silverman, Barry Silverman
+
+ The following is provided under terms of the Creative Commons
+ Attribution-NonCommercial-ShareAlike 3.0 Unported license:
+ http://creativecommons.org/licenses/by-nc-sa/3.0/
+
+ Specify the original author as Greg James and the following URL
+ for original source material:  www.visual6502.org
+*/
+
 var transdefs = [
 ['t0', 357, 558, 217],
 ['t1', 1608, 657, 349],

wires.css

@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2010 Brian Silverman, Barry Silverman
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+*/
+
 body {
  background: white;
  color: black;