fix merge errors with master
[ardour.git] / gtk2_ardour / ardour_ui.cc
2014-01-10 Paul Davisfix merge errors with master
2014-01-08 Paul DavisMerge branch 'master' into cairocanvas
2014-01-02 Paul DavisMerge branch 'master' into cairocanvas
2013-12-28 Paul DavisMerge branch 'master' into cairocanvas
2013-12-27 Paul Davismerge exportvis branch into cairocanvas, to reduce...
2013-12-23 Paul Davisfix redrawing of canvas with an optimized build
2013-12-23 Robin Gareusvtl: do not lock audio [to video] when extracting audio...
2013-12-12 Paul Davisfix merge conflicts from master
2013-12-05 Paul DavisMerge branch 'master' into cairocanvas
2013-12-04 Paul Davischange "cpu" in cpu load backend functions
2013-12-04 Paul Davischange "cpu" in cpu load backend functions
2013-12-03 Paul Davisfix up wscript/build issues in exportvis after merge...
2013-11-30 Paul Davisfix merge with master
2013-11-27 Paul DavisMerge branch 'master' into cairocanvas
2013-11-25 Paul DavisMerge branch 'master' into cairocanvas
2013-11-19 Robin GareusDistinguish Save-as and Snapshot dialog window
2013-11-04 Paul DavisMerge branch 'master' into cairocanvas
2013-10-31 Paul Davisfix merge with master
2013-10-28 nick_mFix thinko in setting order hint.
2013-10-28 Paul Davisfurther fixes for NSM-based startup
2013-10-28 Paul Davisadd error checking and return from attempted NSM-based...
2013-10-25 Paul DavisMerge branch 'ordering_fixup' of https://github.com...
2013-10-25 nick_mUse add_route_dialog's transient_for() window to determ...
2013-10-23 nick_mNew routes are placed after highest selected route.
2013-10-22 Paul Davismerge from master
2013-10-22 Paul DavisMerge branch 'unify_display_ordering' of https://github...
2013-10-22 Paul DavisMerge branch 'miscfix' of https://github.com/mojofunk...
2013-10-21 Tim MayberryForward declare NSM_Client class in ardour_ui.h
2013-10-21 Tim MayberryFix check button handling in Memory Warning Dialog
2013-10-21 Tim MayberryFix two minor memory leaks in pending state dialog
2013-10-20 Paul Davisfix compilation
2013-10-18 Paul DavisMerge branch 'master' into cairocanvas
2013-10-17 Paul Davismerge with master and fix 2 conflicts
2013-10-15 Paul Davismake the startup -> session dialog flow more sensible...
2013-10-12 Paul Davispost a dialog about a session being opened in read...
2013-10-12 Paul Davisremove erroneous ` in string
2013-10-11 Paul Davisdon't use a possibly non-existent window as a transient...
2013-10-11 Paul Davisminor tweaks to audio/MIDI setup window
2013-10-10 Paul Davisnicely handle the (should-never-happen) case of no...
2013-10-08 Paul Davisfix some issues with window flow when session loading...
2013-10-08 Paul Davisuse new GtkUI design in ARDOUR_UI
2013-10-06 Paul Davisfix up some aspects of loading from a cmdline session...
2013-09-24 Paul Davistighten up layout of session dialog; make button say...
2013-09-23 Paul Davismajor rearrangement of startup/session loading code
2013-09-22 Paul Davisuse WindowManager/WMProxy to correctly manage the audio...
2013-09-20 Paul DavisMerge branch 'master' of https://github.com/nmains...
2013-09-19 Paul Davisswitch from JACK_Slave to Engine_Slave
2013-09-19 Paul Davisshow a different audio/MIDI option screen if JACK is...
2013-09-18 Paul Davismore excision of "JACK" from labels, menu items, etc.
2013-09-18 Paul DavisMerge branch 'master' into cairocanvas
2013-09-18 Paul Davischange return type on {disconnect_from,reconnect_to...
2013-09-17 Paul DavisMerge branch 'master' into cairocanvas
2013-09-17 Paul Davisminor fixups for audio/MIDI setup spin buttons (now...
2013-09-14 Paul DavisMerge branch 'master' into cairocanvas
2013-09-14 Paul Davisfix merge conflicts with master
2013-09-12 Paul Davisremove some debug output messages
2013-09-12 Paul Davislots of changes to auto-start (and stop) the backend...
2013-09-10 Paul Davismany changes relating to session construction and audio...
2013-09-09 Paul Davismove engine dialog from a widget to an actual dialog...
2013-09-06 Paul Davisfix merge conflicts with audioengine
2013-09-05 Paul Davisalways save/keep audio/MIDI setup states so that they...
2013-09-04 Paul Davischange names of actions groups that include "jack"
2013-09-03 Paul DavisMerge branch 'master' into audioengine
2013-08-14 Paul DavisMerge branch 'master' into cairocanvas
2013-08-14 Paul Davisfix merge issues with master
2013-08-13 Tim MayberryMove initialization of libardour from ARDOUR_UI class...
2013-08-13 Tim MayberryChange ARDOUR::init return type to bool type for succes...
2013-08-10 Robin GareusMerge branch 'master' into ccmerge
2013-08-09 Paul DavisMerge branch 'master' into audioengine
2013-08-09 Paul Davisfix display of latency
2013-08-09 Paul Davistemporarily ignore AudioEngine::Halted when GUI asks...
2013-08-08 Paul Davisrationalize (a bit) engine start/stop/restart so that...
2013-08-08 Robin Gareusvtl: import audio at video-offset, forget offset on...
2013-08-08 Robin Gareusmake master-meter in toolbar optional
2013-08-08 Robin Gareusadd a peak reset button to the editor meter
2013-08-08 Robin Gareusadd [master] meter to the toolbar
2013-08-08 Colin FletcherWrap calls to add_shortcut_folder() in try { ... }...
2013-08-08 Robin GareusNOOP - prevent headaches and remove cruft
2013-08-08 Paul Davischange wording in audio status when disconnected from...
2013-08-08 Paul Davismajor redesign of MIDI port heirarchy and management...
2013-08-05 Paul Davisfix conflicts after merge with master
2013-08-05 Paul Daviscan now start JACK based on config dialog
2013-08-04 Paul Davisstart work on the changes to EngineControl (dialog...
2013-08-04 Robin Gareusvtl: import audio at video-offset, forget offset on...
2013-08-03 Robin Gareusmake master-meter in toolbar optional
2013-08-03 Paul Davisadd tim's jack_utils code to rationalize setup of JACK...
2013-08-03 Paul Davisaudioengine branch can now load and run at least one...
2013-08-03 Robin Gareusadd a peak reset button to the editor meter
2013-08-01 Paul Davisstart code reorganization needed to deal with backend...
2013-07-31 Paul Davisremove compile errors (still will not link and JACKPort...
2013-07-30 Paul Davisjack_audiobackend.cc finally compiles
2013-07-24 Robin Gareusadd [master] meter to the toolbar
2013-07-24 Paul Davismore miscellaneous changes for audioengine, all of...
2013-07-19 Colin FletcherWrap calls to add_shortcut_folder() in try { ... }...
2013-07-11 Robin GareusNOOP - prevent headaches and remove cruft
2013-07-11 Paul Davisfix conflicts caused by meterbridge merge
2013-07-10 Robin Gareusfix meterbridge window behaviour on session unload...
2013-07-09 Paul DavisMerge branch 'master' into cairocanvas
2013-07-07 Robin Gareusrevert 3c6ff2f0 now that WM-proxy is session-aware..
2013-07-07 Robin Gareusfix/workaround window-proxy session-management
next