Merge branch 'minsec-ruler-display' of https://github.com/djpohly/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 May 2014 13:04:24 +0000 (09:04 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 May 2014 13:04:24 +0000 (09:04 -0400)
commit1ed92db4363a17d845a97404e4ba94be81bfc563
tree0440981d7872e7277e0d570554fbcac3c72c9eda
parentcd0ac04080132464b3e7f19804405ed036ff0cc1
parent32f62beb9039587917eb96a1f1b12469f4d97c36
Merge branch 'minsec-ruler-display' of https://github.com/djpohly/ardour