Commit 02d6d955 authored by Mike Gabriel's avatar Mike Gabriel

rebase copyright

parent 6418305f
...@@ -732,13 +732,6 @@ Files: ChangeLog ...@@ -732,13 +732,6 @@ Files: ChangeLog
client/common/test/.gitignore client/common/test/.gitignore
cmake/ComplexLibrary.cmake cmake/ComplexLibrary.cmake
cmake/ConfigOptions.cmake cmake/ConfigOptions.cmake
<<<<<<< Updated upstream
=======
cmake/FindDBus.cmake
cmake/FindDbusGlib.cmake
cmake/FindDirectFB.cmake
cmake/FindDocBookXSL.cmake
>>>>>>> Stashed changes
cmake/FindFFmpeg.cmake cmake/FindFFmpeg.cmake
cmake/FindFeature.cmake cmake/FindFeature.cmake
cmake/FindGstreamer.cmake cmake/FindGstreamer.cmake
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment