[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello] /: Merge remote-tracking branch 'origin/Applications/14.12'
From:       Ralf Habacker <ralf.habacker () freenet ! de>
Date:       2015-01-18 12:37:45
Message-ID: E1YCp6v-0003tL-3C () scm ! kde ! org
[Download RAW message or body]

Git commit 3860657025868cb0cd9ab0beb11826cdae2fb4d0 by Ralf Habacker.
Committed on 18/01/2015 at 12:31.
Pushed by habacker into branch 'master'.

Merge remote-tracking branch 'origin/Applications/14.12'

Conflicts:
	CMakeLists.txt
	umbrello/dialogs/pages/classgeneralpage.cpp
	umbrello/dialogs/pages/classgeneralpage.h
	umbrello/dialogs/widgets/documentationwidget.cpp


http://commits.kde.org/umbrello/3860657025868cb0cd9ab0beb11826cdae2fb4d0
[prev in list] [next in list] [prev in thread] [next in thread]