From: Simon A. Eugster <simon.eu@gmail.com>
Date: Wed, 15 Feb 2012 17:44:28 +0000 (+0100)
Subject: Merge branch 'next' into audioAlign
X-Git-Url: https://git.sesse.net/?p=kdenlive;a=commitdiff_plain;h=05f4fad9a19434399f43ff76e06d1e1a5f74c0f6

Merge branch 'next' into audioAlign

Conflicts:
	src/lib/CMakeLists.txt
---

05f4fad9a19434399f43ff76e06d1e1a5f74c0f6
diff --cc .gitignore
index e7f8a12f,bdc5af04..f444b545
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,3 @@@
+ *~
  build
 +CMakeLists.txt.user
diff --cc src/CMakeLists.txt
index fa0e56c6,5ccf034e..f69796e3
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -83,11 -77,10 +83,12 @@@ add_subdirectory(beziercurve
  add_subdirectory(colorcorrection)
  add_subdirectory(colorscopes)
  add_subdirectory(commands)
 +add_subdirectory(lib)
 +add_subdirectory(projecttree)
 +add_subdirectory(utils)
  add_subdirectory(databackup)
  add_subdirectory(kiss_fft)
+ add_subdirectory(lib)
  add_subdirectory(mimetypes)
  add_subdirectory(onmonitoritems)
  add_subdirectory(simplekeyframes)
diff --cc src/lib/CMakeLists.txt
index e3a89b07,05dd09fa..fe191f38
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@@ -1,10 -1,5 +1,12 @@@
 +
 +add_subdirectory(audio)
 +
 +# Hack. kdenlive_SRCS is defined in the sub-scope and added to this scope;
 +# now we again need to add it to the parent scope.
 +
  set(kdenlive_SRCS
-     ${kdenlive_SRCS}
-     PARENT_SCOPE
+   ${kdenlive_SRCS}
+   lib/qtimerWithTime.cpp
+   PARENT_SCOPE
 -)
 +)
++