merge with master, including manual merge conflict resolution
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:15 +0000 (16:12 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:15 +0000 (16:12 -0400)
commit30968b854257cb5f9159ca59589f783c85615601
tree81b105c877dd91745b5e06835cc063ad5d6d0a51
parent44564654fd825f198946d0f189421f9e569f68a6
parentcd6cbba29934bb8045640250e09325a5554d5cfe
Merge ... master, including manual merge conflict resolution
gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/tempo_lines.cc
libs/ardour/wscript
wscript