Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

[casparcg] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 765a1c5d13eac85d08736fdd1f659fe820bc316e..41d42c408298aa7138a07197a989ba5558b3a855 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,8 @@ General
   o Copy casparcg_auto_restart.bat into Windows releases.\r
   o Fixed bug with thumbnail generation when there are .-files in the media\r
     folder.\r
+  o Removed CMake platform specification in Linux build script\r
+    (Krzysztof Pyrkosz).\r
 \r
 Consumers\r
 ---------\r