Merge branch 'master' into documentation

Authored by bport on Jan 16 2011, 6:41 PM.

Description

Merge branch 'master' into documentation

Merged Changes

CommitAuthorDetailsCommitted
e636cbb2c978bport
Merge branch 'filemanager-directory' 
Jan 15 2011
7abaab578b4azwabel
* Do not rely on the background-parser to assign the DocumentChangeTracker to… 
Jan 14 2011
dd9427535d49zwabel
* Add a parameter "preferProxyContext" to "DUChainUtils::standardContextForUrl". 
Jan 14 2011
e8a1ef0d77adzwabel
* Fix the assistant architecture so that it supports rich text everywhere *… 
Jan 14 2011
14694afc43fdmwolff
Merge branch '1.2' 
Jan 13 2011
160642ced68bmwolff
don't add infinite number of rows of output, instead limit to 50k lines and… 
Jan 13 2011
55248ee678e1zwabel/mwolff
backport from master: Make sure that working sets are unique to the patch… 
Jan 13 2011
72ad89a577e2zwabel/mwolff
backport from master: Only try creating one parse-job at a time. If more parse… 
Jan 13 2011
e0bd234511fazwabel/mwolff
backport from master: Delete the view _after_ emitting "viewRemoved(..)". This… 
Jan 13 2011
075524ab4b06zwabel/mwolff
backport from master: Also use the cache if the cached list is "empty", it… 
Jan 13 2011
ce03b892bf18bport
Merge branch 'master' into filemanager-directory 
Jan 13 2011
46ddcc293f14bport
Allow user to perform a find-replace action from a directory selected in the… 
Jan 12 2011
1ed49edae5eebport
Enable open and open with action filemanager context menu only for document… 
Jan 10 2011
d68979b16daabport
Allow context menu in filemanager for directory 
Jan 7 2011