Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml (revision 13102)
+++ /trunk/build.xml (revision 13103)
@@ -32,4 +32,5 @@
+
@@ -457,6 +458,6 @@
-
+
Index: /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java (revision 13102)
+++ /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java (revision 13103)
@@ -186,6 +186,6 @@
/**
- * Determines if this primitive has no timestam information.
- * @return {@code true} if this primitive has no timestam information
+ * Determines if this primitive has no timestamp information.
+ * @return {@code true} if this primitive has no timestamp information
* @see #getTimestamp
* @see #getRawTimestamp
Index: /trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (revision 13102)
+++ /trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (revision 13103)
@@ -38,5 +38,5 @@
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().preferences();
+ public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20000);
/**