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

[Torsten Rahn]

What kinds of conflicts? :-)

 
-----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