Merge branch 'master' of github.com:patriciogonzalezvivo/glslViewer

debian/changelog

@@ -1,3 +1,20 @@
+glslviewer (1.4) UNRELEASED; urgency=medium
+
+  * Adding `frag`/`vert` console commands to print fragment/vertex source code
+
+  * Adding -v/--verbose arguments
+
+  * Adding --help argument
+
+  * Changing -m argument for -c/--cursor
+
+  * Compilation time now only shows on -v/--verbose mode
+
+  * COUTs print w '//' at the beginning in case someone wants to use the output directly as source code
+
+
+ -- Patricio Gonzalez Vivo <patricio@ubuntu>  Sat, 25 Nov 2017 03:20:21 -0800
+
 glslviewer (1.3) UNRELEASED; urgency=medium
 
   * Adding console gcc-like precompiler arguments to satisfy GLSL shaders dependencies -I[dir] -D[define]
@@ -7,8 +24,9 @@ glslviewer (1.3) UNRELEASED; urgency=medium
   * Adding travis and editorconfig files to help others contribute
 
   * General housekeeping of utils functions. Now they are split in tools/fs tools/text and tools/geom 
+  * 
 
- -- Patricio Gonzalez Vivo <patricio@ubuntu>  Wed, 16 Aug 2017 11:45:45 -0700
+ -- Patricio Gonzalez Vivo <patricio@ubuntu>  Wed, 16 Aug 2017 03:20:21 -0800
 
 glslviewer (1.2) UNRELEASED; urgency=medium