annotate .settings/org.eclipse.core.runtime.prefs @ 557:b9e5ac26dd83

Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sun, 24 Feb 2013 00:11:40 +0100
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 line.separator=\n