Changeset 86 in josm for .settings


Ignore:
Timestamp:
2006-04-21T14:31:51+02:00 (15 years ago)
Author:
imi
Message:
  • added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

Location:
.settings
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • .settings/org.eclipse.jdt.core.prefs

    r79 r86  
    1 #Mon Apr 03 21:11:54 CEST 2006
     1#Fri Apr 21 12:51:47 CEST 2006
    22eclipse.preferences.version=1
    33org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
     
    6868org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
    6969org.eclipse.jdt.core.formatter.indentation.size=4
    70 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
     70org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=do not insert
    7171org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
    7272org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
  • .settings/org.eclipse.jdt.ui.prefs

    r79 r86  
    1 #Mon Apr 03 21:08:35 CEST 2006
     1#Fri Apr 21 12:51:47 CEST 2006
    22eclipse.preferences.version=1
    33formatter_profile=_josm
Note: See TracChangeset for help on using the changeset viewer.