merge with master, with minor conflict fixes
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 8 Feb 2014 00:00:44 +0000 (19:00 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 8 Feb 2014 00:00:44 +0000 (19:00 -0500)
commit2a7ed69c28c5c4606ff13b3605b9bc9c3eba607d
tree8bc1cbb9df7bab6bafac672d11ce6e63f3a8542d
parent89d5be353addf41e0d6cdf5c70cdc988a0c3d19a
parentd47fe167e3c1dc44e4114227b0e8b83b40b35169
merge with master, with minor conflict fixes
gtk2_ardour/mixer_strip.cc
gtk2_ardour/panner_ui.cc
gtk2_ardour/stereo_panner.cc
libs/ardour/ardour/file_source.h
libs/ardour/file_source.cc
libs/ardour/session_state.cc
wscript