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

projects / ardour.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2875961 c16551c)

author	Paul Davis <paul@linuxaudiosystems.com>
	Fri, 27 Dec 2013 19:29:06 +0000 (14:29 -0500)
committer	Paul Davis <paul@linuxaudiosystems.com>
	Fri, 27 Dec 2013 19:29:06 +0000 (14:29 -0500)
commit	b0e4f81eb3a38b7236ec39f11d5211840a064d15
tree	91a917a2010fbaae80ff7fec6ab343b75bb978c2	tree \| snapshot
parent	28759617c4eb0cbadbd41e6d7ea97d5de182966c	commit \| diff
parent	c16551c80820e9f71341b2f940143c8b3f44f5ce	commit \| diff

merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

Still need to add API export/visibility macros for the canvas library.

18 files changed:

gtk2_ardour/ardour_ui_dialogs.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audioregion.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/control_protocol_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/cycle_timer.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/midi_model.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/region.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/silentfilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/slave.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/utils.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/debuggable.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/utils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/signals.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/stacktrace.h	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/control_protocol/control_protocol.h	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/mackie/mackie_control_protocol.h	diff1 \|	diff2 \|	blob \| history

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