Merge branch 'master' into gh-pages

# Conflicts:
#	devices/pdp11/machine/1170/panel/debugger/README.md
#	versions/c1pjs/1.34.0/c1p-dbg.js
#	versions/c1pjs/1.34.0/c1p.js
#	versions/pc8080/1.34.0/pc8080-dbg.js
#	versions/pc8080/1.34.0/pc8080.js
#	versions/pcx86/1.34.0/pcx86-dbg.js
#	versions/pcx86/1.34.0/pcx86.js
#	versions/pdpjs/1.34.0/pdp11-dbg.js
#	versions/pdpjs/1.34.0/pdp11.js
This commit is contained in:
Jeff Parsons 2017-02-08 10:27:59 -08:00
commit 1081277c92

View file

@ -265,3 +265,6 @@
.screenshot-label {
font-size: x-small;
}
.pcjs-description, .pcjs-status {
line-height: 2.8em !important;
}