Permalink
Browse files

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

…riants

Former-commit-id: c2fdfde
  • Loading branch information...
2 parents f577b34 + f953fe8 commit ec6a7d743aaddcd332c233af4e0523e184c8907d @msproul msproul committed Dec 17, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 app/src/processing/app/Base.java
  2. +1 −1 app/src/processing/app/Editor.java
  3. +1 −1 hardware/pic32/platforms.txt
@@ -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();
@@ -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();
@@ -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

0 comments on commit ec6a7d7

Please sign in to comment.