main.carlh.net Git - ardour.git/commit

projects / ardour.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b80ae88 f230016)

author	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 31 Oct 2013 17:16:51 +0000 (13:16 -0400)
committer	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 31 Oct 2013 17:16:51 +0000 (13:16 -0400)
commit	ea1ccb869a152d7344f498d2a062867f5bcf9d0b
tree	ef3b8dc9d60cd7d1da9ba439384336c1b0009ca2	tree \| snapshot
parent	b80ae88154fbc1b23c97fe60192a304280c8542c	commit \| diff
parent	f2300164d7a89c5e433d3293dfed4c1ab77f0553	commit \| diff

fix merge with master

gtk2_ardour/ardour_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/ardour_ui.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_markers.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_mixer.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_mouse.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_ops.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_routes.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
wscript	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.