Changeset 1efbc190 in sasview for src/sas/sasgui

Timestamp:

Sep 26, 2017 3:16:36 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0a3c740

Parents:

b58265c3

Message:

fix merge errors

File:

• src/sas/sasgui/guiframe/config.py (modified) (1 diff)

src/sas/sasgui/guiframe/config.py

@@ -145 +145 @@
 UPDATE_TIMEOUT = 2
 
-# Time out for updating sasview
-UPDATE_TIMEOUT = 2
-
 def printEVT(message):
     if __EVT_DEBUG__: