projects / web / gag.com / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: b7a181f)
Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
authorBdale Garbee <bdale@gag.com>
Sat, 14 Jul 2012 17:34:15 +0000 (11:34 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 14 Jul 2012 17:34:15 +0000 (11:34 -0600)
bdale/talks/2012/debconf.mdwn [new file with mode: 0644] patch | blob
bdale/talks/2012/linuxcon-japan.mdwn [new file with mode: 0644] patch | blob

diff --git a/bdale/talks/2012/debconf.mdwn b/bdale/talks/2012/debconf.mdwn
new file mode 100644 (file)
index 0000000..e09230b
--- /dev/null
+++ b/bdale/talks/2012/debconf.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2012/debconf/* and ! bdale/talks/2012/debconf/*/*"]]
diff --git a/bdale/talks/2012/linuxcon-japan.mdwn b/bdale/talks/2012/linuxcon-japan.mdwn
new file mode 100644 (file)
index 0000000..e6a0d79
--- /dev/null
+++ b/bdale/talks/2012/linuxcon-japan.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2012/linuxcon-japan/* and ! bdale/talks/2012/linuxcon-japan/*/*"]]
Garbee and Garbee web site