projects
/
ppastats.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4cb4ed
)
fixed previous merge
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 13 Feb 2014 23:30:50 +0000
(23:30 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 13 Feb 2014 23:30:50 +0000
(23:30 +0000)
NEWS
patch
|
blob
|
history
diff --git
a/NEWS
b/NEWS
index
6ee0a24
..
7f3e78b
100644
(file)
--- a/
NEWS
+++ b/
NEWS
@@
-5,14
+5,6
@@
v1.0.0
* fixed compilation issue with old json lib releases using
boolean type and not defining json_bool.
-<<<<<<< .mine
-v0.0.9
-------
-
-=======
->>>>>>> .r1676
-* Fixed compilation issue related to 'boolean' type.
-
v0.0.8
------