Merge branch 'master' into qt5

Authored by nienhueser on Oct 30 2013, 5:18 PM.

Description

Merge branch 'master' into qt5

Details

Committed
nienhueserOct 30 2013, 5:18 PM
Parents
R34:b47483d2a098: Have cmake set fpic option
R34:2773f06af5f5: Reuse MARBLE_PLUGIN_INSTALL_PATH.
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2773f06af5f5nienhueser
Reuse MARBLE_PLUGIN_INSTALL_PATH. 
Oct 20 2013

Empty Commit

This commit is empty and does not affect any paths.