summaryrefslogtreecommitdiff
path: root/Mac/PythonLauncher/PreferencesWindowController.m
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-06-03 16:22:33 -0700
committerNed Deily <nad@python.org>2016-06-03 16:22:33 -0700
commitcb835d875edd3b89100be1befdbe30dc7d59346f (patch)
tree59d15ed1074aa5f5698ac871d317ba3f901065b2 /Mac/PythonLauncher/PreferencesWindowController.m
parenta8dcb08f217f1aa6319f7f3a2b9c3d8e1a7bf69e (diff)
parent369826a879386a6de7e493e5b789fd8a5b5fa5be (diff)
downloadcpython-git-cb835d875edd3b89100be1befdbe30dc7d59346f.tar.gz
final final step in backout of bad default->3.5 merge d085b4f779af: null merge 3.5->default
Diffstat (limited to 'Mac/PythonLauncher/PreferencesWindowController.m')
0 files changed, 0 insertions, 0 deletions