summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2010-05-14 05:13:15 -0400
committerbnewbold <bnewbold@robocracy.org>2010-05-14 05:13:15 -0400
commit0b010738f087274f5deda80b54e2e8beb6efa912 (patch)
tree7a8544acc01614bbca172bcdebdef1cc46c6cae8
parentc678c276cd1d6f9c8fde4d538b867891604bcb4d (diff)
parent4de3e2498102cd3dffd95f3d31135d4f607c0a5a (diff)
downloadknowledge-0b010738f087274f5deda80b54e2e8beb6efa912.tar.gz
knowledge-0b010738f087274f5deda80b54e2e8beb6efa912.zip
Merge branch 'master' of daemon.robocracy.org:/srv/git/knowledge
-rw-r--r--ethernet.page (renamed from Ethernet.page)0
-rw-r--r--film/To Watch.page8
-rw-r--r--film/french-classics.page (renamed from film/French Classics.page)0
-rw-r--r--film/good-movies.page (renamed from film/Good Movies.page)0
-rw-r--r--film/to-watch.page19
-rw-r--r--git-wiki.page (renamed from Git Wiki.page)0
-rw-r--r--mit-courses.page (renamed from MIT Courses.page)0
7 files changed, 19 insertions, 8 deletions
diff --git a/Ethernet.page b/ethernet.page
index d455f21..d455f21 100644
--- a/Ethernet.page
+++ b/ethernet.page
diff --git a/film/To Watch.page b/film/To Watch.page
deleted file mode 100644
index b61a7c1..0000000
--- a/film/To Watch.page
+++ /dev/null
@@ -1,8 +0,0 @@
-Films To Watch
---------------
-
- * Children of Paradise
- * Brain Candy
- * One, Two, Three
- * The White Ribbon (by Haneke)
- \ No newline at end of file
diff --git a/film/French Classics.page b/film/french-classics.page
index a2eecaa..a2eecaa 100644
--- a/film/French Classics.page
+++ b/film/french-classics.page
diff --git a/film/Good Movies.page b/film/good-movies.page
index 23cd0bd..23cd0bd 100644
--- a/film/Good Movies.page
+++ b/film/good-movies.page
diff --git a/film/to-watch.page b/film/to-watch.page
new file mode 100644
index 0000000..1ddc104
--- /dev/null
+++ b/film/to-watch.page
@@ -0,0 +1,19 @@
+Films To Watch
+--------------
+
+ * Children of Paradise
+ * Brain Candy
+ * One, Two, Three
+ * The White Ribbon (by Haneke)
+ * Project Grizzly
+ * Koyaanisqatsi
+ * Baraka
+ * Hell House
+ * Thin Red Line
+ * Thomas Crown Affair (original)
+ * Black Orpheus
+ * Infernal Affairs
+ * All About Lily Chou-Chou
+ * Gummo
+ * La Nuit Americaine (Day for Night)
+ * Last Life in the Universe \ No newline at end of file
diff --git a/Git Wiki.page b/git-wiki.page
index 7538a43..7538a43 100644
--- a/Git Wiki.page
+++ b/git-wiki.page
diff --git a/MIT Courses.page b/mit-courses.page
index be5f2a0..be5f2a0 100644
--- a/MIT Courses.page
+++ b/mit-courses.page