summaryrefslogtreecommitdiff
path: root/devices/zmq_streamer/Makefile.am
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-01 18:35:48 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-01 18:35:48 +0200
commit47aaf10211a0f3380dc82942a8cb4eba8c3c7ea3 (patch)
treeedcb770523d63d4acd7114adc5a92ecf0e52ab51 /devices/zmq_streamer/Makefile.am
parent0fe7d3c998f65fb93b0f3d15c40d8bc2fe0923ad (diff)
parent99ddfa7d65a4556bdbb68fd1831e2de73595f0c7 (diff)
Merge branch 'maint'
* maint: maint: will become 2.0.9 Conflicts: builds/msvc/platform.hpp configure.in
Diffstat (limited to 'devices/zmq_streamer/Makefile.am')
0 files changed, 0 insertions, 0 deletions