[SCM] qt3d packaging branch, experimental, updated. debian/5.5.1-5-12-g18d60dc

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=18d60dc

The following commit has been merged in the experimental branch:
commit 18d60dc9b05764c7ba691731af05c99a924ac946
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Mar 31 22:24:34 2016 -0300

    Fix mistake.
---
 debian/changelog | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3daeb2c..4f70821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 qt3d-opensource-src (5.6.0-1) UNRELEASED; urgency=medium
 
-<<<<<<<
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
     - Bump Qt build dependencies.
@@ -13,17 +12,6 @@ qt3d-opensource-src (5.6.0-1) UNRELEASED; urgency=medium
     - libqt3d5collision5 is not shipped anymore.
     - Ship libqt3dquickinput5.
     - gltfsceneparser now has an auxiliary binary.
-=======
-  [ Lisandro Damián Nicanor Pérez Meyer ]
-  * New upstream release.
-    - Bump Qt build dependencies.
-  * Bump Standards-Version, no changes required.
-  * Update symbols files with buildds' logs.
-  * Update packaging:
-    - Libs with "Renderer" changed it's name to to "Render". This changes
-      SONAME but there are still no rdeps in the archive.
-    - Documentation is now shipped under qt3d/.
->>>>>>>
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Mar 2016 20:06:22 -0300
 

-- 
qt3d packaging