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/FileSettings.h

    r2 r391  
    4646+ (id)newSettingsForFileType: (NSString *)filetype;
    4747
    48 //- (id)init;
    4948- (id)initForFileType: (NSString *)filetype;
    5049- (id)initForFSDefaultFileType: (NSString *)filetype;
    5150- (id)initForDefaultFileType: (NSString *)filetype;
    52 //- (id)initWithFileSettings: (FileSettings *)source;
    5351
    5452- (void)updateFromSource: (id <FileSettingsSource>)source;
    5553- (NSString *)commandLineForScript: (NSString *)script;
    5654
    57 //- (void)applyFactorySettingsForFileType: (NSString *)filetype;
    58 //- (void)saveDefaults;
    59 //- (void)applyUserDefaults: (NSString *)filetype;
    6055- (void)applyValuesFromDict: (NSDictionary *)dict;
    6156- (void)reset;
Note: See TracChangeset for help on using the changeset viewer.