Merge branch 'next' into audioAlign

Conflicts:
	src/lib/CMakeLists.txt

diff --cc .gitignore
index e7f8a12fa7cc166dbefbea961409c79d67f32fd7,bdc5af0409bb506232f5fa7f1b4e87d2bf3fda5b..f444b5458a8bc2ea69a5b4b8cdb74fba293687e4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,3 @@@
+ *~
  build
 +CMakeLists.txt.user

diff --cc src/CMakeLists.txt
index fa0e56c6c468d2f25cc1484a3a9dbb02bd3a680f,5ccf034e01fe73b082b7035d23b15affe26b9cdb..f69796e3ee565294a5c23650f632aa414596e0b5
--- 1/src/CMakeLists.txt
--- 2/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 e3a89b076e58960e988d46323b15517de98dc05e,05dd09fa3467f4897686f487b87c8d31471fab37..fe191f38e369c5dd0bdb95c523b10c28b0d120f8
--- 1/src/lib/CMakeLists.txt
--- 2/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
 -)
 +)
++