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

projects / ardour.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4fac237 a901f28)

author	John Emmas <johne53@tiscali.co.uk>
	Mon, 14 Oct 2013 18:31:22 +0000 (19:31 +0100)
committer	John Emmas <johne53@tiscali.co.uk>
	Mon, 14 Oct 2013 18:31:22 +0000 (19:31 +0100)
commit	e466ce40ad1ba591543020cb7c0aa15dbebef81e
tree	f8e43560917a0a70c48d32ac171e828472cfd794	tree \| snapshot
parent	4fac237fdcf025c5fd5aafe207113abd6abb469b	commit \| diff
parent	a901f28c6287ff99444d6a8afe67b71531a5f7d0	commit \| diff

Merge branch 'master' into windows+cc

Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc

16 files changed:

gtk2_ardour/ardour_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/editor_videotimeline.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/export_video_dialog.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/plugin_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/processor_box.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/public_editor.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/window_manager.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/audioengine.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/route.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/test/test_common.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/test/test_common.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/backends/jack/jack_utils.cc	diff1 \|	diff2 \|	blob \| history

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