* conflict resolution

This commit is contained in:
primalmotion
2010-07-22 14:28:37 +02:00
14 changed files with 764 additions and 110 deletions
+2 -2
View File
@@ -4,8 +4,8 @@ noVNC example: simple example using default controls
<html>
<head>
<title>VNC Client</title>
<link rel="stylesheet" href="include/plain.css" TITLE="plain">
<link rel="Alternate StyleSheet" href="include/black.css" TITLE="Black">
<link rel="stylesheet" href="include/plain.css">
<link rel="alternate stylesheet" href="include/black.css" TITLE="Black">
<!--
<script type='text/javascript'
src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>