Set version to 1.5.1

Merge remote-tracking branch 'arduino/master' into HEAD Conflicts: app/src/processing/app/Base.java todo.txt
arduino · Nov 4, 2012 · dc97316 · dc97316
2 parents 23c7536 + b90f488
commit dc97316
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -51,9 +51,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 150;
+  public static final int REVISION = 151;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0150";
+  static String VERSION_NAME = "0151";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,4 @@
-0150 arduino
+0151 arduino
 
 Fix Linux make.sh, etc. scripts
 Test on Linux.