Mercurial > hg4j
annotate .settings/org.eclipse.core.resources.prefs @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 16 Aug 2013 19:22:59 +0200 |
parents | 868a5a6e9f93 |
children |
rev | line source |
---|---|
149
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
1 #Thu Feb 24 18:49:36 CET 2011 |
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
2 eclipse.preferences.version=1 |
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
3 encoding/<project>=UTF-8 |