Merge pull request #208

f4b69d5 year updated in license (Riccardo Spagni)

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 # 
 # All rights reserved.
 # 
@@ -257,4 +257,4 @@ add_subdirectory(src)
 
 if(BUILD_TESTS)
   add_subdirectory(tests)
-endif()
+endif()

README.md

@@ -1,6 +1,6 @@
 # Monero
 
-Copyright (c) 2014, The Monero Project
+Copyright (c) 2014-2015, The Monero Project
 
 ## Development Resources
 
@@ -30,7 +30,7 @@ Anyone is able to contribute to Monero. If you have a fix or code change, feel f
 
 ## License
 
-Copyright (c) 2014, The Monero Project
+Copyright (c) 2014-2015, The Monero Project
 
 All rights reserved.
 
@@ -136,4 +136,4 @@ Dependencies: Doxygen 1.8.0 or later, Graphviz 2.28 or later (optional).
 
 * To build, change to the root of the source code directory, and run `doxygen Doxyfile`
 * If you have installed Graphviz, you can also generate in-doc diagrams by instead running `HAVE_DOT=YES doxygen Doxyfile`
-* The output will be built in doc/html/
+* The output will be built in doc/html/

ReleaseNotes.txt

@@ -1,47 +0,0 @@
-Monero
-
-Release notes 0.8.8
-
-- JSON RPC v2.0 compatibility
-- JSON RPC over TCP added- Further optimizations
-- Fixed a bug with checkpoints behavior
-- UI improvements for daemon
-- Fixed COIN value (10^12)
-- Raised minimum fee to 5 * (10^9)
-- Temporary fix for block reward DoS attack
-
-Release notes 0.8.7
-
-- Slow hash optimizations
-
-Release notes 0.8.6
-
-- Simplwallet can set extra for transfers
-- Improvements in JSON RPC for wallet
-- UX improvements in simplewallet
-- Win32 compilation
-- Mac OSX compilation
-
-Release notes 0.8.5
-
-- Port mapping for daemon using UPnP
-- Improvements for daemon JSON RPC API
-
-Release notes 0.8.4
-
-- Formalization of high level API
-- Improvements for wallet JSON RPC API
-
-Release notes 0.8.3
-
-- JSON RPC for wallet
-- Fixed bug with blockchain storing
-- Fixed bug with correct display of transfer's change 
-- Bug fix in simple wallet
-
-Release notes 0.8.2
-
-- Now wallet is still working when daemon stores blockchain and can't serve clients
-- No-console option for a daemon
-- Fixed problem with network synchronization
-- Major bug fix in simple wallet

cmake/FindMiniupnpc.cmake

@@ -182,4 +182,4 @@ else ()
 endif ()
 
 MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY)
-# --------------------------------- FindMiniupnpc End ---------------------------------
+# --------------------------------- FindMiniupnpc End ---------------------------------

cmake/FindUnbound.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without modification, are

contrib/epee/LICENSE.txt

@@ -22,4 +22,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

contrib/epee/README.md

@@ -1 +1 @@
-epee -  is a small library of helpers, wrappers, tools and and so on, used to make my life easier. 
+epee -  is a small library of helpers, wrappers, tools and and so on, used to make my life easier. 

contrib/epee/demo/generate_vc_proj.bat

@@ -4,4 +4,4 @@ cd build
 
 cmake "-DBoost_USE_STATIC_LIBS=TRUE" -G "Visual Studio 11 Win64" ..
 cd ..
-pause
+pause

contrib/epee/demo/iface/transport_defs.h

@@ -218,4 +218,4 @@ namespace demo
     s.m_storage_entry_string = epee::serialization::storage_entry(std::string("sdsvsdvs"));
     return s;
   }
-}
+}

contrib/epee/include/copyable_atomic.h

@@ -51,4 +51,4 @@ namespace epee
       return std::atomic<uint32_t>::operator++(fake);
     }
   };
-}
+}

contrib/epee/include/math_helper.h

@@ -269,4 +269,4 @@ PRAGMA_WARNING_POP
 		time_t m_interval;
 	};
 }
-}
+}

contrib/epee/include/md5_l.inl

@@ -560,4 +560,4 @@ namespace md5
 		MD5Final(digest, &context);          /* finish up 2nd pass */
 
 	}
-}
+}

contrib/epee/include/net/http_base.h

@@ -181,4 +181,4 @@ namespace net_utils
 		};
 	}
 }
-}
+}

contrib/epee/include/net/http_client.h

@@ -872,4 +872,4 @@ using namespace std;
 
 	}
 }
-}
+}

contrib/epee/include/net/http_client_base.h

@@ -70,4 +70,4 @@ namespace epee
       i_target_handler* m_powner_filter;
     };
   }
-}
+}

contrib/epee/include/net/http_client_via_api_helper.h

@@ -174,4 +174,4 @@ namespace net_utils
 		return final_res;
 	}
 }
-}
+}

contrib/epee/include/net/http_protocol_handler.inl

@@ -677,4 +677,4 @@ namespace net_utils
 
 //--------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------

contrib/epee/include/net/http_server_impl_base.h

@@ -109,4 +109,4 @@ namespace epee
   protected: 
     net_utils::boosted_tcp_server<net_utils::http::http_custom_handler<t_connection_context> > m_net_server;
   };
-}
+}

contrib/epee/include/net/levin_client_async.h

@@ -574,4 +574,4 @@ namespace levin
 	};
 
 }
-}
+}

contrib/epee/include/net/levin_helper.h

@@ -134,4 +134,4 @@ namespace levin
 		return true;
 	}
 }
-}
+}

contrib/epee/include/net/munin_connection_handler.h

@@ -373,4 +373,4 @@ namespace net_utils
 	}
 }
 }
-#endif//!_MUNIN_CONNECTION_HANDLER_H_
+#endif//!_MUNIN_CONNECTION_HANDLER_H_

contrib/epee/include/net/munin_node_server.h

@@ -46,4 +46,4 @@ namespace net_utils
 	}
 }
 }
-#endif//!_MUNIN_NODE_SERVER_H_
+#endif//!_MUNIN_NODE_SERVER_H_

contrib/epee/include/net/protocol_switcher.h

@@ -118,4 +118,4 @@ namespace net_utils
 	}
 }
 }
-#endif //_PROTOCOL_SWITCHER_H_
+#endif //_PROTOCOL_SWITCHER_H_

contrib/epee/include/net/rpc_method_name.h

@@ -28,4 +28,4 @@
 #pragma once 
 
 
-#define RPC_METHOD_NAME(name) static inline const char* methodname(){return name;}
+#define RPC_METHOD_NAME(name) static inline const char* methodname(){return name;}

contrib/epee/include/net/smtp.h

@@ -178,4 +178,4 @@ namespace net_utils
 }
 }
 
-//#include "smtp.inl"
+//#include "smtp.inl"

contrib/epee/include/net/smtp.inl

@@ -1566,4 +1566,4 @@ namespace net_utils
 
 	}
 }
-}
+}

contrib/epee/include/net/smtp_helper.h

@@ -85,4 +85,4 @@ namespace net_utils
 		}
 	}
 }
-}
+}

contrib/epee/include/serialization/enableable.h

@@ -50,4 +50,4 @@ namespace epee
     {	// construct from specified values
     }
   };
-}
+}

contrib/epee/include/soci_helper.h

@@ -139,4 +139,4 @@ namespace soci
 		std::string m_connection_string;
 	};
 }
-/*}*/
+/*}*/

contrib/epee/include/storages/crypted_storage.h

@@ -59,4 +59,4 @@ public:
 };
 }
 
-#endif //_CRYPTED_STORAGE_H_
+#endif //_CRYPTED_STORAGE_H_

contrib/epee/include/storages/gzipped_inmemstorage.h

@@ -65,4 +65,4 @@ namespace StorageNamed
 }
 }
 
-#endif 
+#endif 

contrib/epee/include/storages/parserse_base_utils.h

@@ -257,4 +257,4 @@ namespace misc_utils
       }
   }
 }
-}
+}

contrib/epee/include/storages/portable_storage_base.h

@@ -157,4 +157,4 @@ namespace epee
     typedef section*      hsection;  
     typedef array_entry*  harray;
   }
-}
+}

contrib/epee/include/storages/portable_storage_from_bin.h

@@ -278,4 +278,4 @@ namespace epee
       m_count -= len;
     }
   }
-}
+}

contrib/epee/include/storages/portable_storage_from_json.h

@@ -376,4 +376,4 @@ namespace epee
       }
     }
   }
-}
+}

contrib/epee/include/storages/portable_storage_template_helper.h

@@ -120,4 +120,4 @@ namespace epee
       return std::move(binary_buff);
     }
   }
-}
+}

contrib/epee/include/storages/portable_storage_to_bin.h

@@ -209,4 +209,4 @@ namespace epee
       return true;
     }
   }
-}
+}

contrib/epee/include/storages/portable_storage_to_json.h

@@ -178,4 +178,4 @@ namespace epee
       strm << make_indent(indent) <<  "}";
     }
   }
-}
+}

contrib/epee/include/storages/portable_storage_val_converters.h

@@ -166,4 +166,4 @@ POP_WARNINGS
       convert_to_same<from_type, to_type, std::is_same<to_type, from_type>::value>::convert(from, to);
     }
   }
-}
+}

contrib/epee/include/time_helper.h

@@ -156,4 +156,4 @@ PRAGMA_WARNING_POP
 
 #endif
 }
-}
+}

contrib/epee/include/warnings.h

@@ -27,4 +27,4 @@
 
 #define DISABLE_GCC_AND_CLANG_WARNING(w) _Pragma(BOOST_PP_STRINGIZE(GCC diagnostic ignored BOOST_PP_STRINGIZE(-W##w)))
 
-#endif
+#endif

contrib/epee/tests/data/storages/invalid_storage_3.bin

@@ -1 +1 @@
-¢IMóÙŸˆ

m_bo
+¢IMóÙŸˆ

m_bo

contrib/epee/tests/generate_vc_proj.bat

@@ -2,4 +2,4 @@ mkdir build
 cd build
 cmake "-DBoost_USE_STATIC_LIBS=TRUE" -G "Visual Studio 11 Win64" ../src
 cd ..
-pause
+pause

contrib/epee/tests/src/net/test_net.h

@@ -400,4 +400,4 @@ namespace tests
   }
 
 }
-}
+}

contrib/epee/tests/src/storages/portable_storages_test.h

@@ -229,4 +229,4 @@ namespace epee
     }
 
   }
-}
+}

contrib/epee/tests/src/tests.cpp

@@ -56,4 +56,4 @@ int main(int argc, char* argv[])
     tests::test_portable_storages(tests_data_path);
   }
   return 1;
-}
+}

external/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 # 
 # All rights reserved.
 # 

external/unbound/contrib/create_unbound_ad_servers.sh

@@ -36,4 +36,4 @@ echo "Done."
 #  the unbound_ad_servers file:
 #
 #   include: $dst_dir/unbound_ad_servers
-#
+#

external/unbound/contrib/unbound_cache.sh

@@ -132,4 +132,4 @@ else
   done
 fi
 
-exit 0
+exit 0

include/INode.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

include/IWallet.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 # 
 # All rights reserved.
 # 

src/common/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 #
 # All rights reserved.
 #

src/common/base58.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/base58.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/boost_serialization_helper.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/command_line.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/command_line.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/dns_utils.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/dns_utils.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/int-util.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/pod-class.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/unordered_containers_boost_serialization.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/util.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/util.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/common/varint.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/connectivity_tool/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 #
 # All rights reserved.
 #

src/connectivity_tool/conn_tool.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, The Monero Project
+# Copyright (c) 2014-2015, The Monero Project
 #
 # All rights reserved.
 #

src/crypto/blake256.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/blake256.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/chacha8.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/crypto-ops-data.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/crypto-ops.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/crypto-ops.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/crypto.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/crypto.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/generic-ops.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/groestl.c

@@ -357,4 +357,4 @@ static int crypto_hash(unsigned char *out,
   return 0;
 }
 
-*/
+*/

src/crypto/groestl.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/groestl_tables.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/hash-extra-blake.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/hash-extra-groestl.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/hash-extra-jh.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/hash-extra-skein.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 // 

src/crypto/hash-ops.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.
 //