[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c5e4b9d

The following commit has been merged in the master branch:
commit c5e4b9d2c05337e117c3fc97af362cc2425cde49
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Sep 27 18:47:51 2011 +0200

    Fix compile issue
---
 global-presence-chooser.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index 68be80c..52c46f5 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -17,8 +17,8 @@ public:
     void setAccountManager(const Tp::AccountManagerPtr &accountManager);
 
 protected:
-    void enterEvent(QEvent *event);
-    void leaveEvent(QEvent *event);
+//     void enterEvent(QEvent *event);
+//     void leaveEvent(QEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void focusOutEvent(QFocusEvent *event);
 

-- 
ktp-contact-list packaging