Merge branch 'develop'

Geoffrey Hunter
2 parents 853d2a4b 73c151e9
Showing 5 changed files with 40 additions and 9 deletions
.gitignore
.vscode/c_cpp_properties.json
CHANGELOG.md
LICENSE.txt
README.rst
 build/
 cmake-build-debug/
-.idea/workspace.xml
 \ No newline at end of file
+.idea/workspace.xml
+.vscode/c_cpp_properties.json
 \ No newline at end of file
@@ -21,7 +21,10 @@
             "macFrameworkPath": [
                 "/System/Library/Frameworks",
                 "/Library/Frameworks"
-            ]
+            ],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
         },
         {
             "name": "Linux",
@@ -54,7 +57,10 @@
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
-            }
+            },
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
         },
         {
             "name": "Win32",
@@ -74,8 +80,11 @@
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
-            }
+            },
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
         }
     ],
-    "version": 3
+    "version": 4
 }
 \ No newline at end of file
@@ -6,12 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
-## [v2.0.1]
+## [v2.0.1] - 2017-11-27
 ### Fixed
 - Fixed link to TravisCI image in README.
-## [v2.0.0]
+## [v2.0.0] - 2017-11-27
 ### Added
 - Added CMake build support.
+MIT License
+
+Copyright (c) 2019 Geoffrey Benjamin Mark Hunter
+
+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.
 \ No newline at end of file
@@ -6,8 +6,8 @@ CppLinuxSerial
 Serial port library written in C++
 ----------------------------------
-.. image:: https://travis-ci.org/mbedded-ninja/CppLinuxSerial.svg?branch=master
-	:target: https://travis-ci.org/mbedded-ninja/CppLinuxSerial
+.. image:: https://travis-ci.org/gbmhunter/CppLinuxSerial.svg?branch=master
+	:target: https://travis-ci.org/gbmhunter/CppLinuxSerial
 .. role:: bash(code)
 	:language: bash