diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-06 15:14:23 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-06 15:14:23 +0200 |
| commit | b6a3c63688b4208a1dc68e13f724554001deee55 (patch) | |
| tree | 18b68da2d42e040898964a82418d1cb1dc9710e5 /configure.ac | |
| parent | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (diff) | |
compile/run fixes after merging master
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0f90e27a..718e39a3 100644 --- a/configure.ac +++ b/configure.ac @@ -569,7 +569,6 @@ if test "x$enable_converter" != "xno" ; then fi fi -<<<<<<< HEAD if test "x$enable_medialib" != "xno" ; then HAVE_MEDIALIB=yes fi |