diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-07-15 15:12:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-07-15 15:12:17 +0200 |
| commit | 19366be186a9a2efff1e6abfe8db59cd9f5f5843 (patch) | |
| tree | 3abb4adeab1a4e86a08bb5bfe61dedf8be178a1c /src/json | |
| parent | fix quoting (diff) | |
| parent | Add call to request unconfirmed balance (diff) | |
| download | discoin-19366be186a9a2efff1e6abfe8db59cd9f5f5843.tar.xz discoin-19366be186a9a2efff1e6abfe8db59cd9f5f5843.zip | |
Merge remote-tracking branch 'satoshi/qtui'
Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp
Diffstat (limited to 'src/json')
| -rw-r--r-- | src/json/LICENSE.txt | 24 | ||||
| -rw-r--r-- | src/json/json_spirit_reader.cpp | 4 | ||||
| -rw-r--r-- | src/json/json_spirit_value.cpp | 2 | ||||
| -rw-r--r-- | src/json/json_spirit_writer.cpp | 4 |
4 files changed, 29 insertions, 5 deletions
diff --git a/src/json/LICENSE.txt b/src/json/LICENSE.txt new file mode 100644 index 000000000..797d5363b --- /dev/null +++ b/src/json/LICENSE.txt @@ -0,0 +1,24 @@ +The MIT License + +Copyright (c) 2007 - 2009 John W. Wilkinson + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/json/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp index 3469bf17a..aa4f63722 100644 --- a/src/json/json_spirit_reader.cpp +++ b/src/json/json_spirit_reader.cpp @@ -3,8 +3,8 @@ // json spirit version 4.03 -#include "json/json_spirit_reader.h" -#include "json/json_spirit_reader_template.h" +#include "json_spirit_reader.h" +#include "json_spirit_reader_template.h" using namespace json_spirit; diff --git a/src/json/json_spirit_value.cpp b/src/json/json_spirit_value.cpp index 2d7236855..44d2f06a0 100644 --- a/src/json/json_spirit_value.cpp +++ b/src/json/json_spirit_value.cpp @@ -5,4 +5,4 @@ // json spirit version 2.00 -#include "json/json_spirit_value.h" +#include "json_spirit_value.h" diff --git a/src/json/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp index 32dfeb2c6..d24a632cf 100644 --- a/src/json/json_spirit_writer.cpp +++ b/src/json/json_spirit_writer.cpp @@ -3,8 +3,8 @@ // json spirit version 4.03 -#include "json/json_spirit_writer.h" -#include "json/json_spirit_writer_template.h" +#include "json_spirit_writer.h" +#include "json_spirit_writer_template.h" void json_spirit::write( const Value& value, std::ostream& os ) { |