diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-28 16:53:46 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-28 16:53:46 +0000 |
| commit | 6876b93fefd3b7fcf5e1977aad4e0cded2ce8674 (patch) | |
| tree | f6d1fd24bbb144c10c6ea822ad5f3b6c121be8f6 | |
| parent | d42ce5e7da1ccf2af9dea50629a5216cb8aa9823 (diff) | |
| parent | c412abe90f970f56c7155d0b90bfc8d2ee44641d (diff) | |
| download | definitions-6876b93fefd3b7fcf5e1977aad4e0cded2ce8674.tar.gz | |
Merge branch 'master' of git://git.baserock.org/baserock/baserock/definitions
| -rw-r--r-- | tools.morph | 2 | ||||
| -rw-r--r-- | trove.morph | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools.morph b/tools.morph index dd5d79dc..77f17a2c 100644 --- a/tools.morph +++ b/tools.morph @@ -92,7 +92,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c + ref: 8db794a8e9565fbc9dda993fc7347436a53dddd4 unpetrify-ref: master build-depends: - cliapp diff --git a/trove.morph b/trove.morph index 73983290..013d2647 100644 --- a/trove.morph +++ b/trove.morph @@ -178,7 +178,7 @@ chunks: - hg-fast-export - name: trove-setup repo: baserock:baserock/trove-setup - ref: 5b689301a2a13dd549ed86d236ff26db6e1fae82 + ref: 56b4fc537662d8d42f366b5cb5be0eada79d8d56 unpetrify-ref: master build-depends: [] - name: lorry-controller |