Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'variants' of github.com:chipKIT32/chipKIT32-MAX into va…

…riants
  • Loading branch information...
commit c2fdfde3b616f99e2cfbaf01a6bb68f2ca8d097c 2 parents 8aa41a7 + 56164d6
@msproul msproul authored
View
2  app/src/processing/app/Base.java
@@ -1000,7 +1000,7 @@ public void rebuildExamplesMenu(JMenu menu) {
boolean found = addSketches(menu, examplesFolder, false);
logger.debug("DEBUG: Find examples in library.core.path = " + libraryPath);
- JMenuItem platformItem = new JMenuItem("test: " + targetname);
+ JMenuItem platformItem = new JMenuItem("Platform: " + targetname);
platformItem.setEnabled(false);
menu.add(platformItem);
menu.addSeparator();
View
2  app/src/processing/app/Editor.java
@@ -1124,7 +1124,7 @@ public void actionPerformed(ActionEvent e) {
// macosx already has its own about menu
if (!Base.isMacOS()) {
menu.addSeparator();
- item = new JMenuItem("About Arduino");
+ item = new JMenuItem("About MPIDE");
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleAbout();
View
2  hardware/pic32/platforms.txt
@@ -41,4 +41,4 @@ pic32.library.path=./hardware/pic32/cores/pic32
pic32.ldscript=chipKIT-BL-mega.ld
pic32.library.core.path=./hardware/pic32/libraries
pic32.compiler.define=::
-pic32.build.variant=Default_64
+pic32.build.variant=Default_100
Please sign in to comment.
Something went wrong with that request. Please try again.