[Marble-devel] Review Request 114353: Playback of KML Tours

[Dennis Nienhüser]

> On Dec. 9, 2013, 5:01 p.m., Dennis Nienhüser wrote:
> > src/lib/marble/TourWidget.ui, line 44
> > <http://git.reviewboard.kde.org/r/114353/diff/2/?file=223315#file223315line44>
> >
> >     merge conflict here (and further below)

Hi Illya,

sorry to nag, can you look into this? We have two other review requests now depending on this one and I'd like to get them all into master.

Regards,
Dennis


- Dennis


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/114353/#review45409
-----------------------------------------------------------


On Dec. 8, 2013, 7:18 p.m., Illya Kovalevskyy wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/114353/
> -----------------------------------------------------------
> 
> (Updated Dec. 8, 2013, 7:18 p.m.)
> 
> 
> Review request for Marble and Dennis Nienhüser.
> 
> 
> Repository: marble
> 
> 
> Description
> -------
> 
> According to Google Code-In 2013 task (http://www.google-melange.com/gci/task/view/google/gci2013/5813452580847616):
> 
> KML tours are played now by TourPlayback class and integrated into TourWidget. It works well and no bugs detected
> 
> 
> Diffs
> -----
> 
>   src/lib/marble/CMakeLists.txt fd5bd3a 
>   src/lib/marble/TourPlayback.h PRE-CREATION 
>   src/lib/marble/TourPlayback.cpp PRE-CREATION 
>   src/lib/marble/TourPlayback_p.h PRE-CREATION 
>   src/lib/marble/TourWidget.h c18c849 
>   src/lib/marble/TourWidget.cpp 8bd7aa6 
>   src/lib/marble/TourWidget.ui 874ecfb 
> 
> Diff: http://git.reviewboard.kde.org/r/114353/diff/
> 
> 
> Testing
> -------
> 
> Official KML examples, unit-tests
> 
> 
> Thanks,
> 
> Illya Kovalevskyy
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20131213/c8527bf8/attachment.html>