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

List:       kde-commits
Subject:    [kdevelop] /: Merge branch '4.3'
From:       Milian Wolff <mail () milianw ! de>
Date:       2012-02-21 13:23:30
Message-ID: 20120221132330.17054A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 50fb400ecf0e5f64c68cef6332f4f863cda9802a by Milian Wolff.
Committed on 21/02/2012 at 14:22.
Pushed by mwolff into branch 'master'.

Merge branch '4.3'

Conflicts:
	CMakeLists.txt
	app/kdevelop.notifyrc
	app/runner/kdevelopsessions.desktop
	app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate
	app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate
	app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate
	app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate
	debuggers/gdb/kdevgdb.desktop
	documentation/manpage/kdevmanpage.desktop
	documentation/qthelp/kdevqthelp.desktop
	documentation/qthelp/kdevqthelp_config.desktop
	formatters/customscript/kdevcustomscript.desktop
	formatters/indent/kdevindent.desktop
	projectbuilders/cmakebuilder/kdevcmakebuilder.desktop
	projectbuilders/makebuilder/kdevmakebuilder.desktop
	projectmanagers/cmake/kdevcmakedocumentation.desktop
	projectmanagers/cmake/kdevcmakemanager.desktop
	projectmanagers/custommake/kdevcustommakemanager.desktop
	providers/kdeprovider/kdevkdeprovider.desktop
	utils/okteta/kdevokteta.desktop

M  +1    -0    app/kdevelop.notifyrc
M  +1    -0    app/kdevelop_ps.desktop
M  +1    -0    documentation/manpage/kdevmanpage.desktop
M  +11   -0    languages/cpp/cppduchain/declarationbuilder.cpp
M  +1    -0    languages/cpp/cppduchain/declarationbuilder.h
M  +2    -1    languages/cpp/cppduchain/templatedeclaration.cpp

http://commits.kde.org/kdevelop/50fb400ecf0e5f64c68cef6332f4f863cda9802a

diff --cc app/kdevelop_ps.desktop
index 906aeff,aabe600..6dfa135
--- a/app/kdevelop_ps.desktop
+++ b/app/kdevelop_ps.desktop
@@@ -5,9 -5,10 +5,10 @@@ MimeType=application/x-kdevelop
  Icon=kdevelop
  Terminal=false
  Name=KDevelop 4 (Pick Session)
+ Name[ca]=KDevelop 4 (Selecció de sessió)
  Name[cs]=KDevelop 4 (Zvolte relaci)
 -Name[da]=KDevelop 4 (vælg session)
  Name[de]=KDevelop 4 (Sitzung auswählen)
 +Name[el]=KDevelop 4 (Επιλογή συνεδρίας)
  Name[es]=KDevelop 4 (escoger sesión)
  Name[et]=KDevelop 4 (seansi valimine)
  Name[fi]=KDevelop 4 (valitse istunto)
[prev in list] [next in list] [prev in thread] [next in thread]