Merge branch 'master' into findreplace

Authored by bport on Nov 27 2010, 10:03 AM.

Description

Merge branch 'master' into findreplace

Conflicts:
plugins/grepview/kdevgrepview.desktop

Merged Changes

CommitAuthorDetailsCommitted
6f9c2cd9d244zwabel
Change the foreground lock to only use a non-recursive mutex, and manage the… 
Nov 26 2010
1d337d3e257amwolff
fix rename of files in build-folders (e.g. qmake) 
Nov 26 2010
f07b4bdeecf1mwolff
fix removal of existing files/folders when they are buildfolders or targets 
Nov 26 2010
aa31add64920mwolff
use genericmanager debug area for abstractfilemanagerplugin + filemanagerlistjob 
Nov 26 2010
7641959c5c31zwabel
Don't use the file contents to determine the mimetype in the language… 
Nov 26 2010
4f67b715c82dScript Kiddy
SVN_SILENT made messages (.desktop file) 
Nov 25 2010
363cc90e6f01apol
Merge branch 'master' of git.kde.org:kdevplatform 
Nov 25 2010
9453575c70b5apol
Make the build tool responsible for renaming the items when rename is triggered… 
Nov 25 2010
31df567d9149Dmitry Risenberg
Merge branch 'master' of git.kde.org:kdevplatform 
Nov 24 2010
c55c484ae9abDmitry Risenberg
Fix line numbers in annotation bar for git. BUG:255599 
Nov 24 2010
f0ecc3773fc4pino
Merge branch '1.1' 
Nov 24 2010
03b1f64de57epino
i18n: do not extract messages from sources in 'tests' subdirectories 
Nov 24 2010
916fd05f5325nalvarez
Minor changes to apidox. 
Nov 23 2010