Merge branch 'dev/david/pgm04b' of vcs:pololu-usb-avr-programmer-v2 i…

…nto dev/david/pgm04b
pololu · Mar 19, 2018 · 8929d02 · 8929d02
2 parents 237125e + 3059695
commit 8929d02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,8 +12,8 @@ set (GUI_NAME "pavr2gui")
 set (DOCUMENTATION_URL "https://www.pololu.com/docs/0J67")
 
 set (SOFTWARE_VERSION_MAJOR 1)
-set (SOFTWARE_VERSION_MINOR 0)
-set (SOFTWARE_VERSION_PATCH 2)
+set (SOFTWARE_VERSION_MINOR 1)
+set (SOFTWARE_VERSION_PATCH 0)
 set (SOFTWARE_VERSION ${SOFTWARE_VERSION_MAJOR}.${SOFTWARE_VERSION_MINOR}.${SOFTWARE_VERSION_PATCH})
 
 # Don't use -rdynamic since it causes musl static linking to not work.

diff --git a/default.nix b/default.nix
@@ -6,4 +6,5 @@ rec {
     cross_inputs = [ env.libusbp env.qt.base ];
   };
   win32 = build nixcrpkgs.win32;
+  linux32 = build nixcrpkgs.linux32;
 }