summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-08-28 17:19:48 +0100
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-08-28 17:19:48 +0100
commit492f734d9c79f51b308ac4fdbd614626207de0b9 (patch)
treee58781ad53c04fa0388d4549299d9725656d2bb6
parenta4f3b3d10c7dda583359d2a481c1dfc4a28ecc8b (diff)
parentc35a326b2a829f3e0806509aa617f0c077f4faac (diff)
downloaddefinitions-492f734d9c79f51b308ac4fdbd614626207de0b9.tar.gz
Merge branch 'baserock/franred/cpython-points-to-no-morph-ref'
Reviewed by: Sam Thursfield <sam.thursfield@codethink.co.uk> Pedro Alvarez <pedro.alvarez@codethink.co.uk> Merged by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/core.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 26264874..857524e6 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -123,8 +123,8 @@ chunks:
- name: cpython
morph: strata/core/cpython.morph
repo: upstream:cpython
- ref: fa86445bfd4fb8e5441d685d92bf8a8ee237f022
- unpetrify-ref: baserock/morph-2.7
+ ref: 1aaa7cd8880727716883d75783dc0569f3e4238b
+ unpetrify-ref: v2.7.2
build-depends:
- openssl-new
- bzip2