From 4544a5816bf31305efe9757f8d1109d9d0914825 Mon Sep 17 00:00:00 2001 From: Naja Melan Date: Sun, 24 Feb 2019 17:06:41 +0100 Subject: [PATCH] Create merge crate and merge_derive --- .gitmodules | 11 ++++++++++- Cargo.toml | 13 ++++++++----- ekke_config | 1 + ekke_merge | 1 + ekke_merge_derive | 1 + 5 files changed, 21 insertions(+), 6 deletions(-) create mode 160000 ekke_config create mode 160000 ekke_merge create mode 160000 ekke_merge_derive diff --git a/.gitmodules b/.gitmodules index fdeb02c..226cf3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,13 @@ url = git@github.com:najamelan/ekke_io.git [submodule "apps/systemd"] path = apps/systemd - url = git@github.com:najamelan/ekke_systemd.git \ No newline at end of file + url = git@github.com:najamelan/ekke_systemd.git +[submodule "ekke_config"] + path = ekke_config + url = git@github.com:najamelan/ekke_config.git +[submodule "ekke_merge"] + path = ekke_merge + url = git@github.com:najamelan/ekke_merge +[submodule "ekke_merge_derive"] + path = ekke_merge_derive + url = git@github.com:najamelan/ekke_merge_derive diff --git a/Cargo.toml b/Cargo.toml index 788b245..07904f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,9 +2,12 @@ members = [ - "ekke_core" , - "ekke_io" , - #"apps/filebrowser" , - "apps/systemd" - + "ekke_core" , + "ekke_io" , + "ekke_config" , + "ekke_merge" , + "ekke_merge/examples/derive", + "ekke_merge_derive", + #"apps/filebrowser" , + "apps/systemd" , ] diff --git a/ekke_config b/ekke_config new file mode 160000 index 0000000..53f86cd --- /dev/null +++ b/ekke_config @@ -0,0 +1 @@ +Subproject commit 53f86cde0db9e0ff6023bd71aa1e7e6bb7f6a365 diff --git a/ekke_merge b/ekke_merge new file mode 160000 index 0000000..3b041bc --- /dev/null +++ b/ekke_merge @@ -0,0 +1 @@ +Subproject commit 3b041bc2b323761b72c432c46a0b4fa50a90c90c diff --git a/ekke_merge_derive b/ekke_merge_derive new file mode 160000 index 0000000..e1d2a59 --- /dev/null +++ b/ekke_merge_derive @@ -0,0 +1 @@ +Subproject commit e1d2a598e61c19c93f90a9759d69b8afd9e3e757