Skip to content
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 9845224 + 58a0dda commit 86885e59645493a4ebf8ce4de0897eadf55d3335 @bruntonspall committed Aug 16, 2012
View
0 default.css → css/default.css
File renamed without changes.
View
1 error.html
@@ -1 +0,0 @@
-Error, error!
View
0 asc.gif → img/asc.gif
File renamed without changes
View
0 bg.gif → img/bg.gif
File renamed without changes
View
0 desc.gif → img/desc.gif
File renamed without changes
View
12 index.html
@@ -5,7 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Amazon EC2 Instance Comparison</title>
- <link rel="stylesheet" href="default.css" type="text/css">
+ <link rel="stylesheet" href="css/default.css" type="text/css">
</head>
<body>
@@ -219,13 +219,13 @@
</table>
<div id="footer">
- Made by <a href="http://twitter.com/powdahound" target="_blank">@powdahound</a> /
- <a href="https://github.com/powdahound/ec2instances.info" target="_blank">Fork on GitHub</a>
+ Made by <a href="http://twitter.com/powdahound" target="_blank">@powdahound</a>, Forked by <a href="http://twitter.com/bruntonspall">bruntonspall</a> /
+ <a href="https://github.com/bruntonspall/ec2instances.info" target="_blank">Fork on GitHub</a>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.0/jquery.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="jquery.tablesorter.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="default.js" type="text/javascript" charset="utf-8"></script>
- <script src="tim-lite.min.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/jquery.tablesorter.min.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/default.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/tim-lite.min.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-34151400-1']);
View
0 default.js → js/default.js
File renamed without changes.
View
0 jquery.tablesorter.min.js → js/jquery.tablesorter.min.js
File renamed without changes.
View
0 tim-lite.min.js → js/tim-lite.min.js
File renamed without changes.

0 comments on commit 86885e5

Please sign in to comment.
Something went wrong with that request. Please try again.