Merge branch 'master' into chore/fix_library_json

2019-01-03 21:13:20 -06:00
parent 0c0ca90382 3880b13e4c
commit 0ffa5f9779
74 changed files with 2283 additions and 2818 deletions
--- a/library.json
+++ b/library.json
@@ -49,7 +49,7 @@
  "build": {
        "flags": [
            "-Igooglemock/include",
-            "-Igooglemock", 
+            "-Igooglemock",
            "-Igoogletest/include",
            "-Igoogletest"
        ]