Files
ardour/libs/ardour
Robin Gareus 11619a37bf Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/imageframe_time_axis.cc
	gtk2_ardour/imageframe_time_axis.h
	gtk2_ardour/imageframe_time_axis_group.cc
	gtk2_ardour/imageframe_time_axis_group.h
	gtk2_ardour/imageframe_time_axis_view.cc
	gtk2_ardour/imageframe_time_axis_view.h
	gtk2_ardour/imageframe_view.cc
	gtk2_ardour/imageframe_view.h
	gtk2_ardour/marker_time_axis.cc
	gtk2_ardour/marker_time_axis.h
	gtk2_ardour/marker_time_axis_view.cc
	gtk2_ardour/marker_time_axis_view.h
	gtk2_ardour/marker_view.cc
	gtk2_ardour/marker_view.h
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/visual_time_axis.cc
	gtk2_ardour/visual_time_axis.h
	libs/canvas/canvas/circle.h
2013-06-14 21:09:24 +02:00
..
2013-04-22 20:02:08 +02:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2012-11-14 20:38:48 +00:00
2013-01-16 18:14:11 +00:00
2013-03-31 09:41:51 -04:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2013-01-28 21:34:17 +00:00
2013-03-27 21:50:18 -04:00
2013-03-23 14:50:58 +01:00
2013-03-27 21:50:18 -04:00
2013-01-16 18:14:11 +00:00
2012-03-01 21:08:58 +00:00
2013-03-27 21:50:18 -04:00
2013-01-20 18:23:42 +00:00
2013-03-27 21:50:18 -04:00
2013-01-09 15:09:13 +00:00
2013-05-17 13:52:16 +02:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2012-08-29 00:30:50 +00:00
2013-06-13 23:00:24 -04:00