annotate .settings/org.eclipse.jdt.core.prefs @ 341:75c452fdd76a

Merging state not detected when there's no conflicts to resolve (no merge/state file)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 17 Nov 2011 07:04:58 +0100
parents dbd663faec1f
children
rev   line source
0
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
1 #Wed Dec 15 01:43:42 CET 2010
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
2 eclipse.preferences.version=1
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
3 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
6 org.eclipse.jdt.core.compiler.compliance=1.5
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
8 org.eclipse.jdt.core.compiler.debug.localVariable=generate
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
9 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
10 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
11 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
dbd663faec1f Basic changelog parsing
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
12 org.eclipse.jdt.core.compiler.source=1.5