Matthew White / Test - History

Updated Layers, fixed merge errors.

Schematic now shows the correct layers. Git added some text to the board file in random places. Deleted that to fix merge error.

Updated Layers

No real change here. Schematic now shows the correct layers.

Merge remote-tracking branch 'origin/master'

# Conflicts:
# active-pcb/kicker-flyback-2015-c/kicker-2015-flyback-c.brd
# scripts/Board/BOARDcolours.brd.scr
# scripts/Board/BoardDefaultColors.scr
# scripts/Board/BoardDefaultLayers.scr
# scripts/Board/BoardToSchematic.scr
# scripts/Board/SwitchToSchematic.brd.scr
# scripts/BoardColors.scr
# scripts/BoardDefaultGrid.scr
# scripts/BoardSwitchToSchematic.scr

Scripts Update

Incorperated rosowa_defaults and added menu support to schematics.
ExporttoPNG not currently working