Merge branch 'master' of git.kde.org:kdevplatform

Authored by Dmitry Risenberg <dmitry.risenberg@gmail.com> on Nov 24 2010, 11:15 PM.

Description

Merge branch 'master' of git.kde.org:kdevplatform

Details

Committed
Dmitry Risenberg <dmitry.risenberg@gmail.com>Nov 24 2010, 11:15 PM
Parents
R32:f0ecc3773fc4: Merge branch '1.1'
R32:c55c484ae9ab: Fix line numbers in annotation bar for git. BUG:255599
Branches
Unknown
Tags
Unknown
Dmitry Risenberg <dmitry.risenberg@gmail.com> committed R32:31df567d9149: Merge branch 'master' of git.kde.org:kdevplatform (authored by Dmitry Risenberg <dmitry.risenberg@gmail.com>).Nov 24 2010, 11:15 PM

Merged Changes

CommitAuthorDetailsCommitted
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