commit 080c557f7772a9879979639fb9a1a2cd7016b9e5 Merge: a92d424 40a369c Author: Runa A. Sandvik <runa.sandvik@gmail.com> Date: Wed Nov 2 21:56:23 2011 +0000 Merge remote-tracking branch 'andrew/master' Conflicts: html/img/step-3.png html/img/step-4.png html/img/step-5.png html/img/step-6.png html/img/step-7.png html/img/tor-1.png html/img/tor-2.png html/css/custom.css | 253 +++++++++++++++++++++++++ html/css/nivo-slider.css | 89 +++++++++ html/css/style.css | 276 +++++++++++++++++++++++++++ html/favicon.ico | Bin 0 -> 15086 bytes html/img/bg.png | Bin 0 -> 376 bytes html/img/logo.png | Bin 0 -> 17016 bytes html/img/step-3.png | Bin 44151 -> 38362 bytes html/img/step-4.png | Bin 46259 -> 36852 bytes html/img/step-5.png | Bin 56957 -> 41685 bytes html/img/step-6.png | Bin 60215 -> 38762 bytes html/img/step-7.png | Bin 53021 -> 51368 bytes html/img/tor-1.png | Bin 46791 -> 38351 bytes html/img/tor-2.png | Bin 60745 -> 42690 bytes html/index.html | 292 ++++++++++++++++++----------- html/js/jquery.tools.min.js | 5 + html/js/libs/modernizr-2.0.6.min.js | 4 + html/nivo-slider/themes/orman/arrows.png | Bin 0 -> 5902 bytes html/nivo-slider/themes/orman/bullets.png | Bin 0 -> 3364 bytes html/nivo-slider/themes/orman/loading.gif | Bin 0 -> 1737 bytes html/nivo-slider/themes/orman/orman.css | 99 ++++++++++ html/nivo-slider/themes/orman/readme.txt | 1 + html/nivo-slider/themes/orman/ribbon.png | Bin 0 -> 12763 bytes html/nivo-slider/themes/orman/slider.png | Bin 0 -> 36094 bytes 23 files changed, 908 insertions(+), 111 deletions(-)