summaryrefslogtreecommitdiff
path: root/directives
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:51:30 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:51:30 +0200
commit9ec8b89f51e0b631163c51724e32184b84770e4c (patch)
tree511750a194808cb0f39b198ab18029bb7397dc38 /directives
parent2b3b3ef6b22755b44e5be6a490fe291c75fbf442 (diff)
parentc105645368dd025efc83b0dd9e68b7a64bf1f005 (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts: (manually resolved) .gitignore Makefile
Diffstat (limited to 'directives')
m---------directives0
1 files changed, 0 insertions, 0 deletions
diff --git a/directives b/directives
new file mode 160000
+Subproject 6634fec4377c1d358edc87c3819c280a9e27338