summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-03-09 17:36:26 (GMT)
committer Jaromil <jaromil@dyne.org>2011-03-09 17:36:26 (GMT)
commite1f23d7d1978fbf63ae173c307c396f2f5174baa (patch)
tree4b6c1c010550d5495d6ec60c31b746f10594b9bb
parent18a81bfc913d305efc4be16d057f52b5e752dcb4 (diff)
parent0f1a73a8849af3605d88ca2fe06a33fb4cc175c8 (diff)
Merge branch 'upstream' into debian0debian0
-rw-r--r--.gitignore2
-rw-r--r--.gitmodules3
m---------doc/web/muse0
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 85a0953..44efca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ TAGS
ylwrap
frei0r.pc
doc/html
+doc/web
+
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..25f6c90
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "doc/web/muse"]
+ path = doc/web/muse
+ url = git://code.dyne.org/dyne-web-tmpl-muse.git
diff --git a/doc/web/muse b/doc/web/muse
new file mode 160000
+Subproject ab53ff31293ae75633495bd02bbd357d5245560