Merge branch 'release/0.1.2' into develop

SloCompTech · SloCompTech · commit 8a1b0713a751 · 2017-09-02T18:55:54.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,6 @@
 *.app
 
 # Ninja
-/build*
+/build*
+
+/.vscode
diff --git a/libbyteconvert/meson.build b/libbyteconvert/meson.build
@@ -1,8 +1,8 @@
 pkg = import('pkgconfig')
-mylib = shared_library('byteconvert', 'ByteConvert.cpp', version : '0.1.1', soversion : '0',install: true)
+mylib = shared_library('byteconvert', 'ByteConvert.cpp', version : '0.1.2', soversion : '0',install: true)
 install_headers('ByteConvert.hpp', subdir : 'ByteConvert')
 pkg.generate(libraries : mylib,
-             version : '0.1.1',
+             version : '0.1.2',
              name : 'libbyteconvert',
              filebase : 'libbyteconvert',
              description : 'A conversion library.')
diff --git a/meson.build b/meson.build
@@ -1,2 +1,2 @@
-project('libbyteconvert','cpp',version:'0.1.1',default_options : ['c_std=c11', 'cpp_std=c++11'])
+project('libbyteconvert','cpp',version:'0.1.2',default_options : ['c_std=c11', 'cpp_std=c++11'])
 subdir('libbyteconvert')

-Original file line number
+Diff line change
 *.app
 # Ninja
 -/build*
 +/build*
++
 +/.vscode
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-project('libbyteconvert','cpp',version:'0.1.1',default_options : ['c_std=c11', 'cpp_std=c++11'])`
	`1`	`+project('libbyteconvert','cpp',version:'0.1.2',default_options : ['c_std=c11', 'cpp_std=c++11'])`
`2`	`2`	`subdir('libbyteconvert')`