diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
| commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
| tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /grc/gui/FileDialogs.py | |
| parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
| parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
Diffstat (limited to 'grc/gui/FileDialogs.py')
| -rw-r--r-- | grc/gui/FileDialogs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/gui/FileDialogs.py b/grc/gui/FileDialogs.py index e9430b1f88..9d047b1ffd 100644 --- a/grc/gui/FileDialogs.py +++ b/grc/gui/FileDialogs.py @@ -199,7 +199,7 @@ class FileDialog(FileDialogHelper): Get the filename and destroy the dialog. Returns: - the filename or None if a close/cancel occured. + the filename or None if a close/cancel occurred. """ filename = self.get_rectified_filename() self.destroy() |