Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Oct 18 2016, 12:57 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Committed
kfunkOct 18 2016, 12:57 PM
Parents
R33:f07e61718306: Next step for use-nullptr
R33:088e4ab98b83: Remove now unused variable
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
088e4ab98b83kfunk
Remove now unused variable 
Oct 17 2016
657a5691d5ccbrauch
"flat" breakpoint pixmap -- I forgot to `git add` the pngs 
Oct 16 2016