diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2011-11-13 08:02:12 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2011-11-13 08:02:12 +0100 |
| commit | dc30da9a8b2d430152e125512e37fefe4d25008c (patch) | |
| tree | 1a46e1b35881a1833e51108017ce220a772f076a /main/.settings | |
| parent | 01a6ad62356e5bb3d67b60508abed7771fbc2603 (diff) | |
| parent | 759f158b115fe27f7c61409d5f540d1effb6c0e1 (diff) | |
| download | cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.zip cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.tar.gz cgeo-dc30da9a8b2d430152e125512e37fefe4d25008c.tar.bz2 | |
Merge remote branch 'stephanme/importwpt'
Conflicts:
tests/src/cgeo/geocaching/files/GPXImporterTest.java
tests/src/cgeo/geocaching/files/GPXParserTest.java
tests/src/cgeo/geocaching/files/LocParserTest.java
Diffstat (limited to 'main/.settings')
| -rw-r--r-- | main/.settings/org.eclipse.jdt.core.prefs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/.settings/org.eclipse.jdt.core.prefs b/main/.settings/org.eclipse.jdt.core.prefs index aaf1455..19b01c3 100644 --- a/main/.settings/org.eclipse.jdt.core.prefs +++ b/main/.settings/org.eclipse.jdt.core.prefs @@ -282,3 +282,4 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
\ No newline at end of file |