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

List:       kde-commits
Subject:    [kdev-php-docs] /
From:       Milian Wolff <mail () milianw ! de>
Date:       2011-01-23 19:27:01
Message-ID: 20110123192701.2D508A6092 () git ! kde ! org
[Download RAW message or body]

Git commit 377e1482259b1980b4f55534ac9aac9e8981f65a by Milian Wolff.
Pushed by mwolff into branch 'master'.

Merge branch '1.2'

Conflicts:
	CMakeLists.txt
	phpdocsplugin.cpp

I  +4    -0    kdevphpdocs.desktop     
I  +2    -0    kdevphpdocs_config.desktop     

http://commits.kde.org/eed79a28/377e1482259b1980b4f55534ac9aac9e8981f65a

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