Merge pull request #212 from yangfl/temp2

Remove trailing space
This commit is contained in:
Max Bruckner 2017-11-04 14:24:47 +01:00 committed by GitHub
commit b5f2e5c540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 45 additions and 45 deletions

View File

@ -238,7 +238,7 @@ endif()
option(ENABLE_LOCALES "Enable the use of locales" ON) option(ENABLE_LOCALES "Enable the use of locales" ON)
if(ENABLE_LOCALES) if(ENABLE_LOCALES)
add_definitions(-DENABLE_LOCALES) add_definitions(-DENABLE_LOCALES)
endif() endif()
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(fuzzing) add_subdirectory(fuzzing)

38
LICENSE
View File

@ -1,20 +1,20 @@
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.

View File

@ -1062,7 +1062,7 @@ fail:
{ {
*return_parse_end = (const char*)local_error.json + local_error.position; *return_parse_end = (const char*)local_error.json + local_error.position;
} }
global_error = local_error; global_error = local_error;
} }

View File

@ -1,8 +1,8 @@
bf{ bf{
"name": "Jack (\"Bee\") Nimble", "name": "Jack (\"Bee\") Nimble",
"format": {"type": "rect", "format": {"type": "rect",
"width": 1920, "width": 1920,
"height": 1080, "height": 1080,
"interlace": false,"frame rate": 24 "interlace": false,"frame rate": 24
} }
} }

View File

@ -6,7 +6,7 @@ bf{"widget": {
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
@ -23,4 +23,4 @@ bf{"widget": {
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
}} }}

View File

@ -6,7 +6,7 @@ bu{"widget": {
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
@ -23,4 +23,4 @@ bu{"widget": {
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
}} }}

View File

@ -6,7 +6,7 @@ uf{"widget": {
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
@ -23,4 +23,4 @@ uf{"widget": {
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
}} }}

View File

@ -6,7 +6,7 @@ uu{"widget": {
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
@ -23,4 +23,4 @@ uu{"widget": {
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
}} }}

View File

@ -1,5 +1,5 @@
bf{"web-app": { bf{"web-app": {
"servlet": [ "servlet": [
{ {
"servlet-name": "cofaxCDS", "servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet", "servlet-class": "org.cofax.cds.CDSServlet",
@ -55,7 +55,7 @@ bf{"web-app": {
{ {
"servlet-name": "cofaxAdmin", "servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"}, "servlet-class": "org.cofax.cds.AdminServlet"},
{ {
"servlet-name": "fileServlet", "servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"}, "servlet-class": "org.cofax.cds.FileServlet"},
@ -82,7 +82,7 @@ bf{"web-app": {
"cofaxAdmin": "/admin/*", "cofaxAdmin": "/admin/*",
"fileServlet": "/static/*", "fileServlet": "/static/*",
"cofaxTools": "/tools/*"}, "cofaxTools": "/tools/*"},
"taglib": { "taglib": {
"taglib-uri": "cofax.tld", "taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}} "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}

View File

@ -1,8 +1,8 @@
{ {
"name": "Jack (\"Bee\") Nimble", "name": "Jack (\"Bee\") Nimble",
"format": {"type": "rect", "format": {"type": "rect",
"width": 1920, "width": 1920,
"height": 1080, "height": 1080,
"interlace": false,"frame rate": 24 "interlace": false,"frame rate": 24
} }
} }

View File

@ -6,7 +6,7 @@
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
@ -23,4 +23,4 @@
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
}} }}

View File

@ -1,5 +1,5 @@
{"web-app": { {"web-app": {
"servlet": [ "servlet": [
{ {
"servlet-name": "cofaxCDS", "servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet", "servlet-class": "org.cofax.cds.CDSServlet",
@ -55,7 +55,7 @@
{ {
"servlet-name": "cofaxAdmin", "servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"}, "servlet-class": "org.cofax.cds.AdminServlet"},
{ {
"servlet-name": "fileServlet", "servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"}, "servlet-class": "org.cofax.cds.FileServlet"},
@ -82,7 +82,7 @@
"cofaxAdmin": "/admin/*", "cofaxAdmin": "/admin/*",
"fileServlet": "/static/*", "fileServlet": "/static/*",
"cofaxTools": "/tools/*"}, "cofaxTools": "/tools/*"},
"taglib": { "taglib": {
"taglib-uri": "cofax.tld", "taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}} "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}