From 2e9fd186fd6377e6a889162e5860d753ced4ec77 Mon Sep 17 00:00:00 2001 From: Steven McDonald Date: Sat, 24 Sep 2011 10:04:12 +1000 Subject: [PATCH] Revert "Moved main site to main/, created non-free/" This reverts commit c780eb595037115610ba0fb21c05a62d09dd73f8. Conflicts: main/valid-css.png main/valid-html401.png non-free/valid-css.png non-free/valid-html401.png valid-css.png valid-html401.png --- main/about.shtml => about.shtml | 0 {main/articles => articles}/creativecommons.shtml | 0 {main/articles => articles}/index.shtml | 0 main/doctype.txt => doctype.txt | 0 main/footer.shtml => footer.shtml | 0 main/head.shtml => head.shtml | 0 main/header.shtml => header.shtml | 0 main/index.shtml => index.shtml | 0 main/licence.shtml => licence.shtml | 0 main/navigation.shtml => navigation.shtml | 0 main/pgp_public_key.asc => pgp_public_key.asc | 0 main/sitename.txt => sitename.txt | 0 main/style.css => style.css | 0 {main/tutorials => tutorials}/915resolution.shtml | 0 {main/tutorials => tutorials}/index.shtml | 0 non-free/valid-css.png => valid-css.png | Bin non-free/valid-html401.png => valid-html401.png | Bin 17 files changed, 0 insertions(+), 0 deletions(-) rename main/about.shtml => about.shtml (100%) rename {main/articles => articles}/creativecommons.shtml (100%) rename {main/articles => articles}/index.shtml (100%) rename main/doctype.txt => doctype.txt (100%) rename main/footer.shtml => footer.shtml (100%) rename main/head.shtml => head.shtml (100%) rename main/header.shtml => header.shtml (100%) rename main/index.shtml => index.shtml (100%) rename main/licence.shtml => licence.shtml (100%) rename main/navigation.shtml => navigation.shtml (100%) rename main/pgp_public_key.asc => pgp_public_key.asc (100%) rename main/sitename.txt => sitename.txt (100%) rename main/style.css => style.css (100%) rename {main/tutorials => tutorials}/915resolution.shtml (100%) rename {main/tutorials => tutorials}/index.shtml (100%) rename non-free/valid-css.png => valid-css.png (100%) rename non-free/valid-html401.png => valid-html401.png (100%) diff --git a/main/about.shtml b/about.shtml similarity index 100% rename from main/about.shtml rename to about.shtml diff --git a/main/articles/creativecommons.shtml b/articles/creativecommons.shtml similarity index 100% rename from main/articles/creativecommons.shtml rename to articles/creativecommons.shtml diff --git a/main/articles/index.shtml b/articles/index.shtml similarity index 100% rename from main/articles/index.shtml rename to articles/index.shtml diff --git a/main/doctype.txt b/doctype.txt similarity index 100% rename from main/doctype.txt rename to doctype.txt diff --git a/main/footer.shtml b/footer.shtml similarity index 100% rename from main/footer.shtml rename to footer.shtml diff --git a/main/head.shtml b/head.shtml similarity index 100% rename from main/head.shtml rename to head.shtml diff --git a/main/header.shtml b/header.shtml similarity index 100% rename from main/header.shtml rename to header.shtml diff --git a/main/index.shtml b/index.shtml similarity index 100% rename from main/index.shtml rename to index.shtml diff --git a/main/licence.shtml b/licence.shtml similarity index 100% rename from main/licence.shtml rename to licence.shtml diff --git a/main/navigation.shtml b/navigation.shtml similarity index 100% rename from main/navigation.shtml rename to navigation.shtml diff --git a/main/pgp_public_key.asc b/pgp_public_key.asc similarity index 100% rename from main/pgp_public_key.asc rename to pgp_public_key.asc diff --git a/main/sitename.txt b/sitename.txt similarity index 100% rename from main/sitename.txt rename to sitename.txt diff --git a/main/style.css b/style.css similarity index 100% rename from main/style.css rename to style.css diff --git a/main/tutorials/915resolution.shtml b/tutorials/915resolution.shtml similarity index 100% rename from main/tutorials/915resolution.shtml rename to tutorials/915resolution.shtml diff --git a/main/tutorials/index.shtml b/tutorials/index.shtml similarity index 100% rename from main/tutorials/index.shtml rename to tutorials/index.shtml diff --git a/non-free/valid-css.png b/valid-css.png similarity index 100% rename from non-free/valid-css.png rename to valid-css.png diff --git a/non-free/valid-html401.png b/valid-html401.png similarity index 100% rename from non-free/valid-html401.png rename to valid-html401.png -- 2.30.2