From 3524f2ff0b07338cd0939d9c695a6bcbb2af39dd Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Thu, 27 Oct 2011 11:45:13 -0400
Subject: Revert "Merge branch 'master' of github.com:arduino/Arduino into
 diskloader_reboot"

This reverts commit df9835efafd13685251749bc210c0b96a18a96a5, reversing
changes made to ec45af8bfa9222a807c075dd1db4b5aa798bba03.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
---
 boards.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boards.txt')

diff --git a/boards.txt b/boards.txt
index aa5c70d..bb36796 100644
--- a/boards.txt
+++ b/boards.txt
@@ -10,7 +10,7 @@ uno.bootloader.extended_fuses=0x05
 uno.bootloader.path=optiboot
 uno.bootloader.file=optiboot_atmega328.hex
 uno.bootloader.unlock_bits=0x3F
-uno.bootloader.lock_bits=0x2F
+uno.bootloader.lock_bits=0x0F
 uno.build.mcu=atmega328p
 uno.build.f_cpu=16000000L
 uno.build.core=arduino
-- 
cgit v1.2.3-18-g5258