version 1.16 includes regmarks code.

fablabnbg · May 15, 2016 · c6971e8 · c6971e8
1 parent e21adc3
commit c6971e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sendto_silhouette.inx b/sendto_silhouette.inx
@@ -74,9 +74,9 @@
     </page>
 
     <page name='about' _gui-text='About'>
-      <param name="about_who" type="description">inkscape-silhouette extension from https://github.com/jnweiger/inkscape-silhouette by Jürgen Weigert [juewei@fabmail.org]</param>
+      <param name="about_who" type="description">inkscape-silhouette extension from https://github.com/jnweiger/inkscape-silhouette by Jürgen Weigert [juewei@fabmail.org] and contributors</param>
       <!-- Keep in sync with sendto_silhouette.py line 103 __version__ = ... -->
-      <param name="about_version" type="description">Version 1.15</param>
+      <param name="about_version" type="description">Version 1.16</param>
     </page>
   </param>
 

diff --git a/sendto_silhouette.py b/sendto_silhouette.py
@@ -71,9 +71,10 @@
 # 2015-06-06 jw, v1.14 -- fixed timout errors, refactored much code.
 #                         Added misc/silhouette_move.py misc/silhouette_cut.py, misc/endless_clock.py
 # 2016-01-15 jw, v1.15 -- ubuntu loads the wrong usb library.
+# 2016-05-15 jw, v1.16 -- merged regmarks code from https://github.com/fablabnbg/inkscape-silhouette/pull/23
 
-__version__ = '1.15'	# Keep in sync with sendto_silhouette.inx ca line 42
-__author__ = 'Juergen Weigert <juewei@fabmail.org>'
+__version__ = '1.16'	# Keep in sync with sendto_silhouette.inx ca line 42
+__author__ = 'Juergen Weigert <juewei@fabmail.org> and contributors'
 
 import sys, os, shutil, time, logging, tempfile