[Marble-devel] Does 4.14 contain all the code it should?

[Albert Astals Cid]

El Dijous, 17 de juliol de 2014, a les 07:20:34, Torsten Rahn va escriure:
> What kinds of conflicts? :-)

Attached.

Cheers,
  Albert

> 
> 
> -----Original-Nachricht-----
> Betreff: Does 4.14 contain all the code it should?
> Datum: Thu, 17 Jul 2014 00:56:28 +0200
> Von: Albert Astals Cid <aacid at kde.org>
> An: marble-devel <marble-devel at kde.org>, Dennis Nienhüser
> <earthwings at gentoo.org>, Torsten Rahn <rahn at kde.org>
> 
> 
> Hi guys, i tried merging 4.13 into 4.14 to make sure that all the code that
> was in 4.13 is in 4.14 but i got a huge conflict (i guess you don't like
> merging (you should makes things like this very easy)) so i can't be sure
> 4.14 contains everything that was in 4.13 too.
> 
> Can anyone confirm that 4.14 indeed contains everything it should?
> 
> Cheers,
> Albert
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Q
Type: text/x-patch
Size: 6701 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20140717/209c0c54/attachment.diff>