Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Mac/PythonLauncher/MyAppDelegate.m

    r2 r391  
    3434- (BOOL)shouldShowUI
    3535{
    36     // if this call comes before applicationDidFinishLaunching: we 
     36    // if this call comes before applicationDidFinishLaunching: we
    3737    // should terminate immedeately after starting the script.
    3838    if (!initial_action_done)
     
    6363    NSString **ext_p;
    6464    int i;
    65    
     65
    6666    if ([[NSUserDefaults standardUserDefaults] boolForKey: @"SkipFileBindingTest"])
    6767        return;
     
    9393    }
    9494}
    95        
     95
    9696@end
Note: See TracChangeset for help on using the changeset viewer.