Merge branch 'master' of github.com:fzenke/auryn

fzenke · Feb 19, 2019 · 537f293 · 537f293
2 parents a452e05 + 49d075c
commit 537f293
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/auryn/AurynVersion.cpp b/src/auryn/AurynVersion.cpp
@@ -6,11 +6,11 @@ namespace auryn {
 
     int AurynVersion::version = 0;
     int AurynVersion::subversion = 8;
-    int AurynVersion::revision_number = 1;
-    NeuronID AurynVersion::tag_binary_spike_monitor = 287960000+100*0+10*8+1*1; //!< file signature for BinarySpikeMonitor files
-    AurynState AurynVersion::tag_binary_state_monitor = 61000+100*0+10*8+1*1; //!< file signature for BinaryStateMonitor files
-    std::string AurynVersion::revision_suffix = "dev-d6c1604";
-    std::string AurynVersion::git_describe = "v0.8.1-12-gd6c1604";
+    int AurynVersion::revision_number = 2;
+    NeuronID AurynVersion::tag_binary_spike_monitor = 287960000+100*0+10*8+1*2; //!< file signature for BinarySpikeMonitor files
+    AurynState AurynVersion::tag_binary_state_monitor = 61000+100*0+10*8+1*2; //!< file signature for BinaryStateMonitor files
+    std::string AurynVersion::revision_suffix = "dev-1610e83";
+    std::string AurynVersion::git_describe = "v0.8.1-136-g1610e83";
 
 }
 
diff --git a/src/auryn/mk_version_info.sh b/src/auryn/mk_version_info.sh
@@ -4,7 +4,7 @@
 
 AURYNVERSION=0
 AURYNSUBVERSION=8
-AURYNREVISIONNUMBER=1
+AURYNREVISIONNUMBER=2
 AURYNREVISIONSUFFIX="dev"