Theirs merge strategy for Travis config
Update Travis config
Update Travis config
Update Travis config
Update Travis config
Update Travis config
Update Travis config
Update Travis config
Merge pull request #14 from rdumusc/master

Added Poppler as an optional dependency to DisplayCluster for PDF support
Add tclap dependency
Add external tclap to Equalizer
Update eqOgre config for Ubuntu 13.10
Add program_options to Collage
Add Boost.unit_test_framework
Merge branch 'master' of https://github.com/Eyescale/config
Add Boost.unit_test_framework to DEB_DEPENDS
Merge pull request #15 from tribal-tec/master

Add Boost.unit_test_framework
Add MacPorts dependencies
Tweak MacPorts dependencies
Tweak MacPorts dependencies