Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-14 00:32:34 +02:00
commit a555f89c99

View file

@ -259,6 +259,7 @@ public class MapPoiTypes {
if (resourceName != null) {
this.resourceName = resourceName;
}
this.categories.clear();
try {
if (this.resourceName == null) {
is = MapPoiTypes.class.getResourceAsStream("poi_types.xml"); //$NON-NLS-1$