Merge branch '1.2'

Conflicts: LICENSE
2010-02-04 21:13:57 +02:00
parent 79e9dae9a0 08dc8d9baf
commit 8d75235ff2
33 changed files with 33 additions and 33 deletions
--- 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.