# HG changeset patch
# User veltr
# Date 1330362635 -3600
# Node ID 21c31c3c317b518d5a95b837ca9f84493ed4e3bc
# Parent  8642f1fb6499fb30889be2763e4d18032bde7f80# Parent  b26c5f16e180707be96c0eaf1efc5bec41a80bc6
Merge with b26c5f16e180707be96c0eaf1efc5bec41a80bc6

diff -r 8642f1fb6499 -r 21c31c3c317b .settings/org.eclipse.core.resources.prefs