aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2017-12-23 11:17:03 +0100
committerGravatar Jorge Aparicio <jorge@japaric.io> 2017-12-23 11:17:03 +0100
commit88f505369c50fa2261ccad3a929ee180cd601fad (patch)
tree329985d6bbdb999e6f7d1b3856899ae1a5a180b7
parentb00f4fec14825ac08f22846ac1dd24ef5dbd96bf (diff)
downloadrtic-88f505369c50fa2261ccad3a929ee180cd601fad.tar.gz
rtic-88f505369c50fa2261ccad3a929ee180cd601fad.tar.zst
rtic-88f505369c50fa2261ccad3a929ee180cd601fad.zip
switch to master branches
Diffstat (limited to '')
-rw-r--r--Cargo.toml4
-rw-r--r--macros/Cargo.toml2
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml
index e1c75492..74de770e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,8 +15,8 @@ version = "0.3.0"
[dependencies]
cortex-m = { git = "https://github.com/japaric/cortex-m" }
untagged-option = "0.1.1"
-# rtfm-core = "0.1.0"
-rtfm-core = { git = "https://github.com/japaric/rtfm-core", branch = "no-static" }
+# rtfm-core = "0.2.0"
+rtfm-core = { git = "https://github.com/japaric/rtfm-core" }
cortex-m-rtfm-macros = { path = "macros" }
[target.'cfg(target_arch = "x86_64")'.dev-dependencies]
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index d2e4da5b..27bd1f56 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -13,7 +13,7 @@ version = "0.2.1"
error-chain = "0.10.0"
quote = "0.3.15"
# rtfm-syntax = "0.2.0"
-rtfm-syntax = { git = "https://github.com/japaric/rtfm-syntax", branch = "init-resources" }
+rtfm-syntax = { git = "https://github.com/japaric/rtfm-syntax" }
syn = "0.11.11"
[lib]