From 88f505369c50fa2261ccad3a929ee180cd601fad Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 23 Dec 2017 11:17:03 +0100
Subject: [PATCH] switch to master branches
---
Cargo.toml | 4 ++--
macros/Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index e1c7549..74de770 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 d2e4da5..27bd1f5 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]
--
GitLab