diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-08 12:58:11 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-08 12:58:11 +0200 |
| commit | bf85a72a067389abfee4498a07b3a2d0fa8443eb (patch) | |
| tree | 638fa8057bcff067005bb6ff263a424126409fc5 /mullvad-daemon | |
| parent | ed1009d84b5766e5cc491dabb61275131cfcc3ee (diff) | |
| parent | 282d1e5d14c4bedb9b16941c764bde81de5a68df (diff) | |
| download | mullvadvpn-bf85a72a067389abfee4498a07b3a2d0fa8443eb.tar.xz mullvadvpn-bf85a72a067389abfee4498a07b3a2d0fa8443eb.zip | |
Merge branch 'add-license'
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 908a906691..09811fddc2 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "mullvad-daemon" version = "0.1.0" -authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] +authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "Mullvad VPN backend daemon. Runs and controls the VPN tunnels." +license = "GPL-3.0" [[bin]] name = "mullvadd" diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 57421b3e01..6953cea498 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -1,3 +1,11 @@ +//! # License +//! +//! Copyright (C) 2017 Amagicom AB +//! +//! This program is free software: you can redistribute it and/or modify it under the terms of the +//! GNU General Public License as published by the Free Software Foundation, either version 3 of +//! the License, or (at your option) any later version. + #[macro_use] extern crate clap; extern crate chrono; |