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

List:       kde-commits
Subject:    [kdev-php] /: Merge branch '1.5'
From:       Milian Wolff <mail () milianw ! de>
Date:       2013-10-29 11:26:06
Message-ID: E1Vb7R0-0001z6-I6 () scm ! kde ! org
[Download RAW message or body]

Git commit 450a590354f3566faaa318c31e0ba80392a98a9c by Milian Wolff.
Committed on 29/10/2013 at 11:26.
Pushed by mwolff into branch 'master'.

Merge branch '1.5'

Conflicts:
	CMakeLists.txt
	app_templates/simple_phpapp/simple_phpapp.kdevtemplate
	kdevphpsupport.desktop
	testprovider/kdevphpunitprovider.desktop


http://commits.kde.org/kdev-php/450a590354f3566faaa318c31e0ba80392a98a9c
[prev in list] [next in list] [prev in thread] [next in thread]