Skip to content

Commit c4089ab

Browse files
committed
Merge branch 'master' into kwongtn_personal
2 parents cfa43be + 68c7bc5 commit c4089ab

File tree

4 files changed

+57
-56
lines changed

4 files changed

+57
-56
lines changed

BluecoinsImportTool.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ int main() {
1717
readFile();
1818
}
1919

20+
cout << "Bluecoins Import Tool v1.1 by KwongTN" << endl;
21+
2022
cout << endl;
2123
cout << "Json file path: \"" << jsonFilename << "\"" << endl;
2224
cout << "Output file path: \"" << outFilename << "\"" << endl;

LICENSE

Lines changed: 0 additions & 55 deletions
This file was deleted.

LICENSE.MIT

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Bluecoins Import Tool
2+
version v1.1
3+
https://github.com/kwongtn/Bluecoins-ImportTool
4+
5+
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
6+
SPDX-License-Identifier: MIT
7+
Copyright &copy; 2019 Kwong Tung Nan
8+
9+
Permission is hereby granted, free of charge, to any person obtaining a copy
10+
of this software and associated documentation files (the "Software"), to deal
11+
in the Software without restriction, including without limitation the rights
12+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
copies of the Software, and to permit persons to whom the Software is
14+
furnished to do so, subject to the following conditions:
15+
16+
The above copyright notice and this permission notice shall be included in all
17+
copies or substantial portions of the Software.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25+
SOFTWARE.

README.md

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/kwongtn/Bluecoins-ImportTool/issues)
55
[![HitCount](http://hits.dwyl.io/kwongtn/Bluecoins-ImportTool.svg)](http://hits.dwyl.io/kwongtn/Bluecoins-ImportTool)
66

7+
[![Coverage Status](https://coveralls.io/repos/github/kwongtn/Bluecoins-ImportTool/badge.svg?branch=master)](https://coveralls.io/github/kwongtn/Bluecoins-ImportTool?branch=master)
8+
9+
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/kwongtn/Bluecoins-ImportTool/LICENSE.MIT)
10+
[![GitHub Releases](https://img.shields.io/github/release/kwongtn/Bluecoins-ImportTool.svg)](https://github.com/kwongtn/Bluecoins-ImportTool/releases)
11+
12+
[![GitHub Issues](https://img.shields.io/github/issues/kwongtn/Bluecoins-ImportTool.svg)](http://github.com/kwongtn/Bluecoins-ImportTool/issues)
13+
14+
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/kwongtn/Bluecoins-ImportTool.svg)](http://isitmaintained.com/project/kwongtn/Bluecoins-ImportTool "Average time to resolve an issue")
15+
[![Percentage of issues still open](http://isitmaintained.com/badge/open/kwongtn/Bluecoins-ImportTool.svg)](http://isitmaintained.com/project/kwongtn/Bluecoins-ImportTool "Percentage of issues still open")
16+
17+
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289)
718

819

920
## Introduction
@@ -100,4 +111,22 @@ const string defaultOutFileName = "<Your path>";
100111
- 26 June 2019, Transfers logic completed
101112
- 24 June 2019, Overall completed
102113
- 21 June 2019, json file standard decided
103-
- 16 June 2019, Project Started
114+
- 16 June 2019, Project Started
115+
116+
## License
117+
118+
<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
119+
120+
This tool is licensed under the MIT License <http://opensource.org/licenses/MIT>.
121+
Copyright &copy; 2019 Kwong Tung Nan
122+
123+
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:
124+
125+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
126+
127+
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.
128+
129+
* * *
130+
131+
This tool contains code from "json for modern C++" from Niels Lohmann which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above).
132+
Copyright &copy; 2013-2019 [Niels Lohmann](http://nlohmann.me/) <mail@nlohmann.me>

0 commit comments

Comments
 (0)