mraa: Update to v1.2.3

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
eclipse · Aug 10, 2016 · d700cae · d700cae
1 parent 3560963
commit d700cae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ include (GetGitRevisionDescription)
 git_describe (VERSION "--tags")
 if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND")
   message (WARNING " - Install git to compile a production libmraa!")
-  set (VERSION "v1.2.2-dirty")
+  set (VERSION "v1.2.3-dirty")
 endif ()
 
 message (STATUS "INFO - libmraa Version ${VERSION}")

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -5,6 +5,10 @@ This changelog is meant as a quick & rough guide to what has changed between
 versions. The API is now fairly stable but when new calls/features are added
 they are listed here. Anything pre 0.2.x is ignored.
 
+**1.2.3**
+  * Revert 1.2.1 binding.gyp changed that had side effect of enabling JSONPLAT in mraa.c
+  * improve travis.ci to load mraa.node as compiled from make npmpkg target
+
 **1.2.2**
   * remove jsonplat from prehashed npm builds (see docs/npm.md for details)
   * internal spelling fix