diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
| commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
| tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /gtk2_ardour/editor_videotimeline.cc | |
| parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
| parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) | |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index a4a0b1b210..e1adb6c8b6 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -17,7 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef WITH_VIDEOTIMELINE #include <jack/types.h> @@ -139,5 +138,3 @@ Editor::export_video () } #endif } - -#endif /* WITH_VIDEOTIMELINE */ |