diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-04-07 09:27:07 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-04-07 09:27:07 +0200 |
| commit | 86be715a7fa38393f03c4c478cea8fbf26b8e082 (patch) | |
| tree | 8dbb1cfada45731ed74e3f75520102f01254279e | |
| parent | 30fad8d78135e72cf671d1b01ee1b1c6643ff21c (diff) | |
| download | mullvadvpn-86be715a7fa38393f03c4c478cea8fbf26b8e082.tar.xz mullvadvpn-86be715a7fa38393f03c4c478cea8fbf26b8e082.zip | |
Rename talpid_daemon to mullvad_daemon
| -rw-r--r-- | Cargo.lock | 30 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad_daemon/Cargo.toml (renamed from talpid_daemon/Cargo.toml) | 4 | ||||
| -rw-r--r-- | mullvad_daemon/src/frontend_ipc_router.rs (renamed from talpid_daemon/src/frontend_ipc_router.rs) | 0 | ||||
| -rw-r--r-- | mullvad_daemon/src/main.rs (renamed from talpid_daemon/src/main.rs) | 0 |
5 files changed, 18 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9e03d8161e..937559823b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -366,6 +366,21 @@ dependencies = [ ] [[package]] +name = "mullvad_daemon" +version = "0.1.0" +dependencies = [ + "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc)", + "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "talpid_ipc 0.1.0", +] + +[[package]] name = "net2" version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -621,21 +636,6 @@ dependencies = [ ] [[package]] -name = "talpid_daemon" -version = "0.1.0" -dependencies = [ - "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc)", - "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "talpid_ipc 0.1.0", -] - -[[package]] name = "talpid_ipc" version = "0.1.0" dependencies = [ diff --git a/Cargo.toml b/Cargo.toml index dd15996b0e..ec561b5566 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["talpid_daemon", "talpid_openvpn_plugin", "openvpn_ffi", "talpid_cli", "talpid_ipc"] +members = ["mullvad_daemon", "talpid_openvpn_plugin", "openvpn_ffi", "talpid_cli", "talpid_ipc"] diff --git a/talpid_daemon/Cargo.toml b/mullvad_daemon/Cargo.toml index da0580cb0a..0529c153e7 100644 --- a/talpid_daemon/Cargo.toml +++ b/mullvad_daemon/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "talpid_daemon" +name = "mullvad_daemon" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] -description = "The meat of talpid, the core if you wish" +description = "The meat of Mullvad, the core if you wish" [dependencies] error-chain = "0.8" diff --git a/talpid_daemon/src/frontend_ipc_router.rs b/mullvad_daemon/src/frontend_ipc_router.rs index f203a2fe72..f203a2fe72 100644 --- a/talpid_daemon/src/frontend_ipc_router.rs +++ b/mullvad_daemon/src/frontend_ipc_router.rs diff --git a/talpid_daemon/src/main.rs b/mullvad_daemon/src/main.rs index e4e732d749..e4e732d749 100644 --- a/talpid_daemon/src/main.rs +++ b/mullvad_daemon/src/main.rs |