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

List:       kde-commits
Subject:    [kdevplatform] /
From:       Milian Wolff <mail () milianw ! de>
Date:       2011-01-23 19:21:37
Message-ID: 20110123192137.87C10A6092 () git ! kde ! org
[Download RAW message or body]

Git commit 40edf57ad44ba07ea21a07a1ac0e733ccb32fbee by Milian Wolff.
Pushed by mwolff into branch 'master'.

Merge branch '1.2'

Conflicts:
	CMakeLists.txt

I  +12   -0    language/codegen/createclass.cpp     
I  +0    -1    language/duchain/topducontextdynamicdata.cpp     
I  +2    -0    plugins/grepview/kdevgrepview.desktop     

http://commits.kde.org/1419bb81/40edf57ad44ba07ea21a07a1ac0e733ccb32fbee

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