FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source 
Conflicts:
	LICENSE
This commit is contained in:
Petri Lehtinen 2010-02-04 21:13:57 +02:00
commit 8d75235ff2
33 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/conf.py
View File

@ -43,7 +43,7 @@ master_doc = 'index'
# General information about the project.
project = u'Jansson'
copyright = u'2009, Petri Lehtinen'
copyright = u'2009, 2010 Petri Lehtinen'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the

2
doc/ext/refcounting.py
View File

@ -19,7 +19,7 @@
<description of the json_object function>
:copyright: Copyright 2009 Petri Lehtinen <petri@digip.org>
:copyright: Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
:license: MIT, see LICENSE for details.
"""

2
doc/github_commits.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/dump.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/hashtable.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/hashtable.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/jansson.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/jansson_private.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/load.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/strbuffer.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/strbuffer.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/utf.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/utf.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/util.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
src/value.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/bin/json_process.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/scripts/run-tests.sh
View File

@ -1,4 +1,4 @@
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/scripts/valgrind.sh
View File

@ -1,4 +1,4 @@
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_array.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_copy.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_equal.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_load.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_number.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_object.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/test_simple.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/api/util.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
* Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.

2
test/suites/encoding-flags/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/invalid-strip/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/invalid-unicode/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/invalid/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/valid-strip/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.

2
test/suites/valid/run
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
# Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
#
# Jansson is free software; you can redistribute it and/or modify
# it under the terms of the MIT license. See LICENSE for details.