diff options
author | Petri Lehtinen <petri@digip.org> | 2010-02-04 21:13:57 +0200 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2010-02-04 21:13:57 +0200 |
commit | 8d75235ff22dc4aced697e198c3c024f1f4b88fe (patch) | |
tree | b421270cf5e2231cf2bf5898864942de0e6226a6 /src | |
parent | 79e9dae9a0694fa62d89d6b5eed4691497ddaee0 (diff) | |
parent | 08dc8d9bafcb13bb1541894918f4a394e644e6e1 (diff) | |
download | jansson-8d75235ff22dc4aced697e198c3c024f1f4b88fe.zip jansson-8d75235ff22dc4aced697e198c3c024f1f4b88fe.tar.gz jansson-8d75235ff22dc4aced697e198c3c024f1f4b88fe.tar.bz2 |
Merge branch '1.2'
Conflicts:
LICENSE
Diffstat (limited to 'src')
-rw-r--r-- | src/dump.c | 2 | ||||
-rw-r--r-- | src/hashtable.c | 2 | ||||
-rw-r--r-- | src/hashtable.h | 2 | ||||
-rw-r--r-- | src/jansson.h | 2 | ||||
-rw-r--r-- | src/jansson_private.h | 2 | ||||
-rw-r--r-- | src/load.c | 2 | ||||
-rw-r--r-- | src/strbuffer.c | 2 | ||||
-rw-r--r-- | src/strbuffer.h | 2 | ||||
-rw-r--r-- | src/utf.c | 2 | ||||
-rw-r--r-- | src/utf.h | 2 | ||||
-rw-r--r-- | src/util.h | 2 | ||||
-rw-r--r-- | src/value.c | 2 |
12 files changed, 12 insertions, 12 deletions
@@ -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. diff --git a/src/hashtable.c b/src/hashtable.c index 990fd6e..0d4a9f2 100644 --- a/src/hashtable.c +++ b/src/hashtable.c @@ -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. diff --git a/src/hashtable.h b/src/hashtable.h index e920c6b..6d3c736 100644 --- a/src/hashtable.h +++ b/src/hashtable.h @@ -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. diff --git a/src/jansson.h b/src/jansson.h index d703c7b..55dce0f 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -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. diff --git a/src/jansson_private.h b/src/jansson_private.h index 3e9bb7f..3045956 100644 --- a/src/jansson_private.h +++ b/src/jansson_private.h @@ -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. @@ -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. diff --git a/src/strbuffer.c b/src/strbuffer.c index 1a71a53..3496024 100644 --- a/src/strbuffer.c +++ b/src/strbuffer.c @@ -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. diff --git a/src/strbuffer.h b/src/strbuffer.h index 4afefa9..f4c5f77 100644 --- a/src/strbuffer.h +++ b/src/strbuffer.h @@ -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. @@ -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. @@ -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. @@ -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. diff --git a/src/value.c b/src/value.c index 31109ff..35166f4 100644 --- a/src/value.c +++ b/src/value.c @@ -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. |