Merge branch 'master' into findreplace
Conflicts:
plugins/grepview/kdevgrepview.desktop
bport | Nov 27 2010, 10:03 AM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
6f9c2cd9d244 | zwabel | Change the foreground lock to only use a non-recursive mutex, and manage the… | Nov 26 2010 | |||
1d337d3e257a | mwolff | fix rename of files in build-folders (e.g. qmake) | Nov 26 2010 | |||
f07b4bdeecf1 | mwolff | fix removal of existing files/folders when they are buildfolders or targets | Nov 26 2010 | |||
aa31add64920 | mwolff | use genericmanager debug area for abstractfilemanagerplugin + filemanagerlistjob | Nov 26 2010 | |||
7641959c5c31 | zwabel | Don't use the file contents to determine the mimetype in the language… | Nov 26 2010 | |||
4f67b715c82d | Script Kiddy | SVN_SILENT made messages (.desktop file) | Nov 25 2010 | |||
363cc90e6f01 | apol | Merge branch 'master' of git.kde.org:kdevplatform | Nov 25 2010 | |||
9453575c70b5 | apol | Make the build tool responsible for renaming the items when rename is triggered… | Nov 25 2010 | |||
31df567d9149 | Dmitry Risenberg | Merge branch 'master' of git.kde.org:kdevplatform | Nov 24 2010 | |||
c55c484ae9ab | Dmitry Risenberg | Fix line numbers in annotation bar for git. BUG:255599 | Nov 24 2010 | |||
f0ecc3773fc4 | pino | Merge branch '1.1' | Nov 24 2010 | |||
03b1f64de57e | pino | i18n: do not extract messages from sources in 'tests' subdirectories | Nov 24 2010 | |||
916fd05f5325 | nalvarez | Minor changes to apidox. | Nov 23 2010 |