Diffusion KDevelop c8ef3eeea53a

Merge remote-tracking branch 'origin/1.7'
c8ef3eeea53a
Actions

Authored by zhanghuijie on Apr 1 2016, 8:04 AM.

Description

Merge remote-tracking branch 'origin/1.7'

  1. Conflicts:
  2. outputview/outputfilteringstrategies.cpp

Details

Committed
zhanghuijieApr 1 2016, 8:04 AM
Differential Revision
D2701: Process QML runtime errors
Parents
R32:f3348ac06350: fix ant
R32:d9a7ee0f5757: Merge remote-tracking branch 'origin/5.0'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
f3348ac06350zhanghuijie
fix ant 
Apr 1 2016

Changes (1)

PathPackages
Moutputview/outputfilteringstrategies.cpp

R32:c8ef3eeea53a

View Options

outputview/outputfilteringstrategies.cpp

Loading...