aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorstraccio <lord.strambo@gmail.com>2016-06-22 10:52:07 +0200
committerstraccio <lord.strambo@gmail.com>2016-06-22 10:52:07 +0200
commit6c5589bd3ce91b5123088b8f28472605aa327195 (patch)
treec4954f993f8eff0124a81efe3aa800e21ddbad5a /README.md
parente3d97f76f5ce2256c90460719eae19621374cac3 (diff)
parentc0fea5ccd9d4db662c2a64e8c390d671d138bae7 (diff)
Merge remote-tracking branch 'sudar/master'
Diffstat (limited to 'README.md')
-rw-r--r--README.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/README.md b/README.md
index 120d1da..bf59185 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ whilst [Blink](examples/Blink/Makefile) demonstrates the minimal settings requir
Download a copy of this repo some where in your system or install it through a package.
-On the Mac you might want to set:
+On the Mac with IDE 1.0 you might want to set:
```make
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
@@ -144,6 +144,12 @@ On the Mac you might want to set:
BOARD_TAG = mega2560
```
+On the Mac with IDE 1.5+ it's like above but with
+
+```
+ ARDUINO_DIR = /Applications/Arduino.app/Contents/Java
+```
+
On Linux (if you have installed through package), you shouldn't need to set anything other than your board type and port:
```make
@@ -242,7 +248,7 @@ See examples/BlinkTeensy for example usage.
## Versioning
-The current version of the makefile is `1.5`. You can find the full history in the [HISTORY.md](HISTORY.md) file
+The current version of the makefile is `1.5.1`. You can find the full history in the [HISTORY.md](HISTORY.md) file
This project adheres to Semantic [Versioning 2.0](http://semver.org/).