Merge branch 'dev' into edge

1 files changed, 3 insertions, 12 deletions

diff --git a/node/Mutex.hpp b/node/Mutex.hpp
index a3adc079..d451ede0 100644
--- a/node/Mutex.hpp
+++ b/node/Mutex.hpp
@@ -1,6 +1,6 @@
 /*

  * ZeroTier One - Network Virtualization Everywhere

- * Copyright (C) 2011-2015  ZeroTier, Inc.

+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/

  *

  * 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

@@ -14,15 +14,6 @@
  *

  * You should have received a copy of the GNU General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- *

- * --

- *

- * ZeroTier may be used and distributed under the terms of the GPLv3, which

- * are available at: http://www.gnu.org/licenses/gpl-3.0.html

- *

- * If you would like to embed ZeroTier into a commercial application or

- * redistribute it in a modified binary form, please contact ZeroTier Networks

- * LLC. Start here: http://www.zerotier.com/

  */

 

 #ifndef ZT_MUTEX_HPP

@@ -82,14 +73,14 @@ public:
 	class Lock : NonCopyable

 	{

 	public:

-		Lock(Mutex &m) 

+		Lock(Mutex &m)

 			throw() :

 			_m(&m)

 		{

 			m.lock();

 		}

 

-		Lock(const Mutex &m) 

+		Lock(const Mutex &m)

 			throw() :

 			_m(const_cast<Mutex *>(&m))

 		{