rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-17 06:52:18 +01:00
Code Issues Releases Activity

Set version to 1.5.1

Browse Source 
Merge remote-tracking branch 'arduino/master' into HEAD

Conflicts:
	app/src/processing/app/Base.java
	todo.txt
This commit is contained in:
Cristian Maglie 2012-11-04 22:55:40 +01:00
commit dc97316100
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/Base.java
View File

@ -51,9 +51,9 @@ import static processing.app.I18n._;
* 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;

2
todo.txt
View File

@ -1,4 +1,4 @@
0150 arduino
0151 arduino
Fix Linux make.sh, etc. scripts
Test on Linux.