projects
/
ardour.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
fix errors in manual conflict resolution
[ardour.git]
/
libs
/
ardour
/
test
/
test_common.cc
2014-06-02
Paul Davis
merge with master and fix 4 conflicts by hand
blob
|
commitdiff
|
raw
2014-05-19
Colin Fletcher
Merge branch 'export-dialog' into cairocanvas
blob
|
commitdiff
|
raw
2014-03-22
Paul Davis
Merge ... master, primarily for adrian's maximise-mixer...
blob
|
commitdiff
|
raw
2014-02-12
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-02-08
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-02-08
Paul Davis
merge with master, with minor conflict fixes
blob
|
commitdiff
|
raw
2014-02-04
Paul Davis
merge (w/fix) with master
blob
|
commitdiff
|
raw
2014-01-30
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-29
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-23
Paul Davis
fix merge conflict with master
blob
|
commitdiff
|
raw
2014-01-19
Paul Davis
visibility macros and flush() added to SrcFileSource...
blob
|
commitdiff
|
raw
2014-01-17
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-17
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-16
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-16
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-16
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-15
Paul Davis
Merge branch 'master' into cairocanvas
blob
|
commitdiff
|
raw
2014-01-15
Paul Davis
merge with master
blob
|
commitdiff
|
raw
2014-01-15
Paul Davis
merge with master
blob
|
commitdiff
|
raw
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
Merge windows+cc branch into cairocanvas branch. Not...
blob
|
commitdiff
|
raw
2014-01-08
Colin Fletcher
Merge remote-tracking branch 'origin/master' into expor...
blob
|
commitdiff
|
raw
|
diff to current
2013-12-04
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-12-03
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-11-30
Paul Davis
merge and resolve conflict with master
blob
|
commitdiff
|
raw
2013-11-27
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-11-27
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-11-26
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-11-26
Paul Davis
resolve merge with master (?)
blob
|
commitdiff
|
raw
2013-10-23
Paul Davis
fix merge conflicts with master
blob
|
commitdiff
|
raw
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
2013-10-16
John Emmas
Merge remote-tracking branch 'remotes/origin/master...
blob
|
commitdiff
|
raw
2013-10-15
Paul Davis
Merge branch 'master' into windows
blob
|
commitdiff
|
raw
2013-10-14
John Emmas
Merge branch 'master' into windows+cc
blob
|
commitdiff
|
raw
2013-10-11
Tim Mayberry
Add arg to test function to be able to prefix test...
blob
|
commitdiff
|
raw
|
diff to current
2013-10-11
Tim Mayberry
Add get_test_sample_rate to common test functions in...
blob
|
commitdiff
|
raw
|
diff to current
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
|
diff to current
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 windows
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 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-06
Tim Mayberry
Rename SearchPath class Searchpath
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-08
Paul Davis
theoretically: "Add new_test_output_dir to common libar...
blob
|
commitdiff
|
raw
|
diff to current
2013-08-06
John Emmas
Merge branch 'windows' of git.ardour.org:ardour/ardour...
blob
|
commitdiff
|
raw
|
diff to current
2013-08-04
John Emmas
'libs/ardour' - Platform specific changes and includes
blob
|
commitdiff
|
raw
|
diff to current
2013-07-11
Paul Davis
theoretically: "Add new_test_output_dir to common libar...
blob
|
commitdiff
|
raw
|
diff to current