Merge remote-tracking branch 'flames/master'

This commit is contained in:
FrozenCow 2011-03-01 02:01:51 +01:00
commit d54532d899
50 changed files with 19 additions and 19 deletions

View file

@ -8,7 +8,7 @@
<meta name="keywords" content="minecraft, map, dynamic" />
<meta name="description" content="Minecraft Dynamic Map" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<link rel="icon" href="dynmap.ico" type="image/ico" />
<link rel="icon" href="images/dynmap.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="dynmap_style.css" media="screen" />
<!-- <link rel="stylesheet" type="text/css" href="override.css" media="screen" /> -->