aboutsummaryrefslogtreecommitdiff
path: root/community/gsoc/project_ideas.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-03-26 01:50:10 +0100
committerThomas Schwinge <thomas@schwinge.name>2011-03-26 01:50:10 +0100
commitd90f4e5e4ab2f8d8c0d233f2067c89e7ed01d103 (patch)
treed3be3f14d15a3faf1dc0fceab552085cc93a226c /community/gsoc/project_ideas.mdwn
parent546c76ea22295c1b889dc63c1b4332fe24340323 (diff)
parentee947ab4eff2bda9bc6409ed69f6f68b5164602e (diff)
downloadweb-d90f4e5e4ab2f8d8c0d233f2067c89e7ed01d103.tar.gz
web-d90f4e5e4ab2f8d8c0d233f2067c89e7ed01d103.tar.bz2
web-d90f4e5e4ab2f8d8c0d233f2067c89e7ed01d103.zip
Merge commit 'ee947ab4eff2bda9bc6409ed69f6f68b5164602e'
Conflicts: community/gsoc/project_ideas/dtrace.mdwn
Diffstat (limited to 'community/gsoc/project_ideas.mdwn')
-rw-r--r--community/gsoc/project_ideas.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/community/gsoc/project_ideas.mdwn b/community/gsoc/project_ideas.mdwn
index 8d31ed7f..0c249b62 100644
--- a/community/gsoc/project_ideas.mdwn
+++ b/community/gsoc/project_ideas.mdwn
@@ -107,3 +107,5 @@ See also the list of [Hurd-related X.org project ideas](http://wiki.x.org/wiki/H
[[!inline pages="community/gsoc/project_ideas/libcap" show=0 feeds=no actions=yes]]
[[!inline pages="community/gsoc/project_ideas/xattr" show=0 feeds=no actions=yes]]
[[!inline pages="community/gsoc/project_ideas/valgrind" show=0 feeds=no actions=yes]]
+[[!inline pages="community/gsoc/project_ideas/driver_glue_code" show=0 feeds=no actions=yes]]
+[[!inline pages="community/gsoc/project_ideas/dtrace" show=0 feeds=no actions=yes]]