Robin Dunn 9b5f40caa4 Merge branch 'master' into release-prep ...

# Conflicts:
#	etg/_propgrid.py
#	etg/propgrid.py
#	etg/propgridproperty.py
#	ext/wxWidgets

2017-03-14 20:01:53 -07:00

..

sphinx

Add some deprecated items for things in Classic that are no longer needed, and also some custom helpers, etc.

2017-02-20 19:30:30 -08:00

classic_vs_phoenix.rst

Use fully qualified names

2016-07-28 19:50:47 -07:00

MigrationGuide.rst

text tweak in the Version Numbers section

2017-02-14 19:31:59 -08:00

phoenix-fire-md.png

Optimize PNGs-Sphinx

2016-10-02 17:30:34 -05:00