> On Aug. 22, 2015, 6:42 a.m., Dennis Nienhüser wrote: > > src/lib/marble/osm/OsmPresetLibrary.cpp, line 97 > > <https://git.reviewboard.kde.org/r/124672/diff/2-5/?file=395055#file395055line97> > > > > Can you check with > > https://git.reviewboard.kde.org/r/124511/diff/6#index_header (will be > > pushed soon) that there are no conflicts between both patches?
well, koldavid's patch does not apply anymore, but there shouldn't be any real conflicts ( except the fact that he has to manually apply some of it ). I'll make sure he knows about my changes - Marius ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124672/#review84174 ----------------------------------------------------------- On Aug. 24, 2015, 8:33 p.m., Marius Stanciu wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/124672/ > ----------------------------------------------------------- > > (Updated Aug. 24, 2015, 8:33 p.m.) > > > Review request for Marble. > > > Repository: marble > > > Description > ------- > > Moved the osm presets from the GeoDataFeature to a separate class. This makes > accessing the preset styles much easier and clearer. > Added additional tags to the list. > > > Diffs > ----- > > src/lib/marble/geodata/data/GeoDataFeature.h ea23cd8 > src/lib/marble/geodata/data/GeoDataFeature.cpp 4443162 > src/lib/marble/geodata/data/GeoDataFeature_p.h 962f0d5 > src/lib/marble/osm/OsmPresetLibrary.h PRE-CREATION > src/lib/marble/osm/OsmPresetLibrary.cpp PRE-CREATION > src/plugins/runner/json/JsonParser.cpp 2c1de39 > src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp f21220d > src/plugins/runner/osm/handlers/OsmTagTagHandler.cpp 148ea7d > > Diff: https://git.reviewboard.kde.org/r/124672/diff/ > > > Testing > ------- > > > Thanks, > > Marius Stanciu > >
_______________________________________________ Marble-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/marble-devel
