Merge remote-tracking branch 'origin/1.7'

Authored by zhanghuijie on Apr 9 2016, 1:30 AM.

Description

Merge remote-tracking branch 'origin/1.7'

  1. Conflicts:
  2. outputview/tests/test_filteringstrategy.cpp

Merged Changes

CommitAuthorDetailsCommitted
708228e1333dD1354zhanghuijie
unit tests for extracting file/line from messages produced by javac with ant 
Apr 9 2016