diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-03-01 14:23:21 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-03-01 14:23:21 +0000 |
commit | 6770e671b26f658b6422120221ea46c0efc9f319 (patch) | |
tree | 3d133625e0c8a1ccaf90fe4ccd92543acd64e07d | |
parent | c2d155e8cdf27d2901567337345bfde4b29d1de7 (diff) | |
parent | 58990c93b3e7fbff90e62399e713244f2e54fbf1 (diff) | |
download | definitions-6770e671b26f658b6422120221ea46c0efc9f319.tar.gz |
Merge remote-tracking branch 'origin/jjardon/gtk-doc'
Conflicts:
foundation.morph
-rw-r--r-- | foundation.morph | 6 | ||||
-rw-r--r-- | tools.morph | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/foundation.morph b/foundation.morph index 88a03c25..39e366d1 100644 --- a/foundation.morph +++ b/foundation.morph @@ -117,12 +117,6 @@ ] }, { - "name": "gtk-doc-stub", - "repo": "upstream:gtk-doc-stub", - "ref": "baserock/morph", - "build-depends": [] - }, - { "name": "help2man", "repo": "upstream:help2man", "ref": "baserock/morph", diff --git a/tools.morph b/tools.morph index a094dcd1..007dad52 100644 --- a/tools.morph +++ b/tools.morph @@ -163,6 +163,12 @@ "build-depends": [] }, { + "name": "gtk-doc-stub", + "repo": "upstream:gtk-doc-stub", + "ref": "baserock/morph", + "build-depends": [] + }, + { "name": "vim", "repo": "upstream:vim", "ref": "baserock/morph", |