[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. debian/1.1.2+nmu1-3-ge28fc1b

Pino Toscano pino-guest at alioth.debian.org
Wed Jan 26 15:18:15 UTC 2011


The following commit has been merged in the master branch:
commit e28fc1ba31502dddc7247fc97346d18487bea09d
Merge: b52b31a8ece1aa7ea9f293002ac301b8ab1cd92d 297402f5f0d5e5c0492dfcface2f8dcaf9d9cdde
Author: Pino Toscano <pino at kde.org>
Date:   Wed Jan 26 16:17:59 2011 +0100

    Merge remote branch 'origin/squeeze'
    
    Conflicts:
    	debian/changelog

 debian/changelog |    7 +++++++
 kaboom.pro       |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index b0bbdbb,f6b3a4a..287085f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,19 @@@
 +kaboom (1.1.3) UNRELEASED; urgency=low
 +
 +  +++ Changes by Pino Toscano:
 +
 +  * Make relativeSymLinkTarget() compiling (and hopefully working) also
 +    on OSes without PATH_MAX defined (e.g. GNU/Hurd).
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 24 Dec 2009 15:48:36 +0100
 +
+ kaboom (1.1.2+nmu1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Actualy Add French translation. (Closes: #605753) 
+ 
+  -- David Prévot <david at tilapin.org>  Thu, 09 Dec 2010 17:01:58 -0400
+ 
  kaboom (1.1.2) unstable; urgency=low
  
    +++ Changes by George Kiagiadakis:

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list