Merge remote-tracking branch 'origin/1.6'
Conflicts:
outputview/outputfilteringstrategies.cpp
Description
Description
Details
Details
- Committed
kfunk Feb 13 2014, 11:39 PM - Parents
- R32:0c2d8dc7755f: Make compile
R32:3ccc6e0174fc: Merge remote-tracking branch 'origin/1.6' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0c2d8dc7755f | kfunk | Make compile | Feb 13 2014 | |||
| da01132ff579 | kfunk | Output filter: Support Waf and scons, too | Feb 13 2014 |