summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-12 15:02:46 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-12 15:02:46 +0100
commit23ea96e88e236a29485dce5d475d5dfe61e3d1e2 (patch)
tree396d298e156589f499532739beb2d80a5f5bd44d
parent4ad7807c9adfa67f28a6415aa92bd020d9a7f6e4 (diff)
parent423697e3bf16ad6231b7ec316b767af1fffb3439 (diff)
downloadmorphs-23ea96e88e236a29485dce5d475d5dfe61e3d1e2.tar.gz
Merge branch 'liw/cliapp'
Reorder stuff to make it build.
-rw-r--r--devel.morph18
1 files changed, 9 insertions, 9 deletions
diff --git a/devel.morph b/devel.morph
index b0f8cf8..28e78d2 100644
--- a/devel.morph
+++ b/devel.morph
@@ -228,15 +228,6 @@
"build-depends": [ "make", "readline", "openssl" ]
},
{
- "name": "cliapp",
- "repo": "upstream:cliapp",
- "ref": "trunk",
- "build-depends": [
- "cpython",
- "coverage-test-runner"
- ]
- },
- {
"name": "git",
"repo": "upstream:git",
"ref": "baserock/morph",
@@ -287,6 +278,15 @@
]
},
{
+ "name": "cliapp",
+ "repo": "upstream:cliapp",
+ "ref": "trunk",
+ "build-depends": [
+ "cpython",
+ "python-coverage-test-runner"
+ ]
+ },
+ {
"name": "python-ttystatus",
"repo": "upstream:python-ttystatus",
"ref": "baserock/morph",