Skip to content

Commit

Permalink
Merge pull request #69 from missionpinball/dev
Browse files Browse the repository at this point in the history
Merge dev to master for 0.18.0
  • Loading branch information
toomanybrians committed Jun 2, 2015
2 parents 8263f3b + 793d57b commit 9780d05
Show file tree
Hide file tree
Showing 347 changed files with 4,731 additions and 31,406 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
# Additional stuff for the LaTeX preamble.
#'preamble': '',

'fontpkg': '\\usepackage{opensans}'
#'fontpkg': '\\usepackage{opensans}'
}

# Grouping the document tree into LaTeX files. List of tuples
Expand Down
Binary file removed docs/generated/doctrees/environment.pickle
Binary file not shown.
Binary file removed docs/generated/doctrees/index.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.autofire.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.ball_device.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.driver.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.flasher.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.flipper.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.gi.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.led.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.matrix_light.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.playfield.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.rollover.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.devices.score_reel.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.game.attract.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.game.game.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.core.display.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.core.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.core.modes.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.core.sound.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.elements.text.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.media_controller.version.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.platform.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.platform.fast.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.platform.p3_roc.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.platform.p_roc.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.platform.virtual.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.plugins.auditor.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.plugins.socket_events.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.assets.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.bcp.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.config.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.devices.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.events.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.light_controller.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.logic_blocks.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.machine.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.modes.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.platform.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.scoring.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.scriptlet.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.switch_controller.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.tasks.doctree
Binary file not shown.
Binary file modified docs/generated/doctrees/mpf.system.timing.doctree
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/generated/html/.buildinfo

This file was deleted.

26 changes: 0 additions & 26 deletions docs/generated/html/_sources/index.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mc.txt

This file was deleted.

10 changes: 0 additions & 10 deletions docs/generated/html/_sources/modules.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.autofire.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.ball_device.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.diverter.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.driver.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.drop_target.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.flasher.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.flipper.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.gi.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.led.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.matrix_light.txt

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.playfield.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.rollover.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.switch.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.devices.target.txt

This file was deleted.

32 changes: 0 additions & 32 deletions docs/generated/html/_sources/mpf.devices.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.game.attract.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.game.game.txt

This file was deleted.

7 changes: 0 additions & 7 deletions docs/generated/html/_sources/mpf.game.player.txt

This file was deleted.

19 changes: 0 additions & 19 deletions docs/generated/html/_sources/mpf.game.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions docs/generated/html/_sources/mpf.media_controller.core.txt

This file was deleted.

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions docs/generated/html/_sources/mpf.media_controller.decorators.txt

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9780d05

Please sign in to comment.