projects
/
ardour.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge (with conflict fixes) with master (even against rgareus' recommendation)
[ardour.git]
/
gtk2_ardour
/
audio_time_axis.cc
2014-01-14
Paul Davis
merge (with conflict fixes) with master (even against...
blob
|
commitdiff
|
raw
2014-01-11
Paul Davis
fix merge with master
blob
|
commitdiff
|
raw
2014-01-10
Paul Davis
finished merge of cairocanvas with windows and windows...
blob
|
commitdiff
|
raw
2014-01-10
Paul Davis
Merge windows+cc branch into cairocanvas branch. Not...
blob
|
commitdiff
|
raw
2014-01-10
Paul Davis
fix merge errors with master
blob
|
commitdiff
|
raw
|
diff to current
2014-01-08
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2014-01-02
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-12-28
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-12-27
Paul Davis
merge exportvis branch into cairocanvas, to reduce...
blob
|
commitdiff
|
raw
|
diff to current
2013-12-23
Paul Davis
fix redrawing of canvas with an optimized build
blob
|
commitdiff
|
raw
|
diff to current
2013-12-12
Paul Davis
fix merge conflicts from master
blob
|
commitdiff
|
raw
|
diff to current
2013-12-05
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-12-04
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-12-03
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-11-30
Paul Davis
fix merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-11-30
Paul Davis
merge and resolve conflict with master
blob
|
commitdiff
|
raw
|
diff to current
2013-11-27
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-11-27
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-11-27
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-11-26
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-11-26
Paul Davis
resolve merge with master (?)
blob
|
commitdiff
|
raw
|
diff to current
2013-11-25
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-11-04
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-10-31
Paul Davis
fix merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-10-23
Paul Davis
fix merge conflicts with master
blob
|
commitdiff
|
raw
|
diff to current
2013-10-22
Paul Davis
merge from master
blob
|
commitdiff
|
raw
|
diff to current
2013-10-18
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-10-18
John Emmas
Merge remote-tracking branch 'remotes/origin/exportvis...
blob
|
commitdiff
|
raw
2013-10-17
Paul Davis
merge with master and fix 2 conflicts
blob
|
commitdiff
|
raw
|
diff to current
2013-10-17
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-10-16
John Emmas
Merge remote-tracking branch 'remotes/origin/master...
blob
|
commitdiff
|
raw
2013-10-15
John Emmas
Merge branch 'windows' into windows+cc
blob
|
commitdiff
|
raw
2013-10-15
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-10-14
John Emmas
Merge branch 'master' into windows+cc
blob
|
commitdiff
|
raw
2013-10-11
John Emmas
Merge branch 'windows' into windows+cc
blob
|
commitdiff
|
raw
2013-10-09
Paul Davis
Merge ... master, fixing conflicts in 3 wscript files
blob
|
commitdiff
|
raw
|
diff to current
2013-10-06
John Emmas
Merge branch 'master' into windows+cc
blob
|
commitdiff
|
raw
2013-10-03
John Emmas
'gtk2_ardour' - Use 'const_iterator' where appropriate...
blob
|
commitdiff
|
raw
2013-09-25
John Emmas
Merge branch 'cairocanvas' into windows+cc
blob
|
commitdiff
|
raw
|
diff to current
2013-09-21
John Emmas
Merge remote-tracking branch 'remotes/origin/cairocanva...
blob
|
commitdiff
|
raw
|
diff to current
2013-09-18
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-09-18
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-17
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-09-17
Paul Davis
fix conflicts and merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-09-14
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-09-14
Paul Davis
fix merge conflicts with master
blob
|
commitdiff
|
raw
|
diff to current
2013-09-14
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-14
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-13
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-13
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-12
Paul Davis
merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-09-12
Paul Davis
incomplete merge of master into windows (requires upcom...
blob
|
commitdiff
|
raw
|
diff to current
2013-09-06
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-03
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-09-03
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-08-24
Paul Davis
fix merge conflicts from master
blob
|
commitdiff
|
raw
|
diff to current
2013-08-14
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-08-10
Robin Gareus
Merge branch 'master' into ccmerge
blob
|
commitdiff
|
raw
|
diff to current
2013-08-02
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-08-01
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-08-01
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-08-01
Paul Davis
fix merge conflict from master
blob
|
commitdiff
|
raw
|
diff to current
2013-07-17
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-07-14
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
|
diff to current
2013-07-11
Paul Davis
Fix ambiguous type CheckMenuItem that is also defined...
blob
|
commitdiff
|
raw
|
diff to current
2013-07-11
Paul Davis
fix conflicts caused by meterbridge merge
blob
|
commitdiff
|
raw
|
diff to current
2013-07-09
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-07-01
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-06-26
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-06-14
Robin Gareus
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-06-14
Paul Davis
merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-06-07
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-06-06
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-05-08
Paul Davis
merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-05-05
Paul Davis
merge with master
blob
|
commitdiff
|
raw
|
diff to current
2013-05-03
Paul Davis
merge resolution with master
blob
|
commitdiff
|
raw
|
diff to current
2013-04-26
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-11
Robin Gareus
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-10
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-09
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-06
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-06
Paul Davis
Merge ... master, including manual merge conflict resol...
blob
|
commitdiff
|
raw
|
diff to current
2013-04-06
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
|
diff to current
2013-04-04
Paul Davis
initial commit of hand merging, plus getting "ancient...
blob
|
commitdiff
|
raw
|
diff to current
2012-09-15
Carl Hetherington
Check for panner_shell rather than panner before
blob
|
commitdiff
|
raw
|
diff to current
2012-05-24
David Robillard
Remove over 500 unnecessary includes (including 54...
blob
|
commitdiff
|
raw
|
diff to current
2012-05-22
Paul Davis
remove, convert, comment several cerr statements
blob
|
commitdiff
|
raw
|
diff to current
2012-04-16
Carl Hetherington
Fairly major change to the way in which crossfades...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-27
Carl Hetherington
Re-work layering in possibly debatable ways. Sketchy...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-19
Carl Hetherington
Fix mute display on session load (#4480).
blob
|
commitdiff
|
raw
|
diff to current
2011-11-02
Paul Davis
solo buttons are now ArdourButtons
blob
|
commitdiff
|
raw
|
diff to current
2011-11-02
Paul Davis
mute and send-alert buttons are now ArdourButtons
blob
|
commitdiff
|
raw
|
diff to current
2011-07-11
Paul Davis
fix crashing bug where pan_tracks.front() was used...
blob
|
commitdiff
|
raw
|
diff to current
2011-07-07
Paul Davis
introduce GUIObjectState; massive, pervasive changes...
blob
|
commitdiff
|
raw
|
diff to current
2011-06-11
Paul Davis
major, substantive reworking of how we store GUI inform...
blob
|
commitdiff
|
raw
|
diff to current
2011-06-01
David Robillard
Delete trailing whitespace
blob
|
commitdiff
|
raw
|
diff to current
2011-03-07
Carl Hetherington
Make Active apply to the selection.
blob
|
commitdiff
|
raw
|
diff to current
2011-03-07
Carl Hetherington
Make stuff in the automation menu apply to the track...
blob
|
commitdiff
|
raw
|
diff to current
2011-03-03
Paul Davis
deframe audio regions as well as MIDI when entering...
blob
|
commitdiff
|
raw
|
diff to current
2011-02-23
Carl Hetherington
Make hide/show all crossfades apply to the selection.
blob
|
commitdiff
|
raw
|
diff to current
next