modified:   pinguino/examples/01.Basics/BareMinimum/BareMinimum.pde
	modified:   pinguino/examples/01.Basics/Blink/Blink.pde
	modified:   pinguino/examples/01.Basics/Blink/k2000.pde
	modified:   pinguino/examples/03.Analog/Fading/Fading.pde
	modified:   pinguino/examples/04.Communication/i2c/24xx64.pde
	modified:   pinguino/examples/08.Interrupt/BlinkLedWithInterrupt.pde
	modified:   pinguino/p32/include/non-free/proc/p32mx220f032b.h
	modified:   pinguino/p32/include/non-free/proc/p32mx220f032d.h
	modified:   pinguino/p32/include/non-free/proc/p32mx250f128b.h
	modified:   pinguino/p32/include/non-free/proc/p32mx440f256h.h
	modified:   pinguino/p32/include/non-free/proc/p32mx460f512l.h
	modified:   pinguino/p32/include/non-free/proc/p32mx795f512h.h
	modified:   pinguino/p32/include/non-free/proc/p32mx795f512l.h
	modified:   pinguino/p32/include/non-free/proc/p32mxgeneric.h
	modified:   pinguino/p32/include/non-free/proc/ppic32mx.h
	modified:   pinguino/p32/include/pinguino/core/__cdc.c
	modified:   pinguino/p32/include/pinguino/core/system.c
	modified:   pinguino/p32/include/pinguino/libraries/stepper.c
	modified:   pinguino/p32/pdl/stepper.pdl32
	modified:   pinguino/p32/pdl/system.pdl32
	modified:   pinguino/p8/pdl/i2c.pdl
	modified:   pinguino/p8/pdl/pinguino.pdl
	modified:   pinguino/p8/pinguino/core/analog.c
	modified:   pinguino/p8/pinguino/core/digitalw.c
	modified:   pinguino/p8/pinguino/core/interrupt.c
	modified:   pinguino/p8/pinguino/core/pin.h
	modified:   pinguino/p8/pinguino/libraries/ST7565.c
	modified:   pinguino/python_api/boards.py
	modified:   pinguino/python_api/uploader/uploader8.py
	modified:   pinguino/python_api/uploader/uploaderVSC.py
	modified:   pinguino/source/main.c
fixed:   pinguino/python_api/uploader/uploader8.py
preparing merge
preparing merge
preparing merge
preparing merge
preparing merge
preparing merge
Merge branch 'package' of git://github.com/PinguinoIDE/pinguino-ide into package
prepare merge