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

[casparcg] / CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index af29ef3e946bbc8baee2396642f0227f00391497..09950a55ea5d69325569480a05bb43d0033251c6 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 CasparCG 2.0.4 Stable (w.r.t 2.0.3 Stable)\r
-=========================================\r
+==========================================\r
 \r
 General\r
 -------\r
@@ -46,8 +46,9 @@ AMCP
     parameter. Example: MIXER 1 MASTERVOLUME 0.5\r
   o THUMBNAIL LIST/RETRIEVE/GENERATE/GENERATE_ALL command was added to support\r
     the thumbnail feature.\r
-  o ADD 1 FILE output.mov SEPARETE_KEY activates the separate key feature of the\r
+  o ADD 1 FILE output.mov SEPARATE_KEY activates the separate key feature of the\r
     ffmpeg consumer creating an additional output_a.mov containing only the key.\r
+  o Added KILL command for shutting down the server without console access.\r
 \r
 CasparCG 2.0.3 Stable (w.r.t 2.0.3 Alpha)\r
 =========================================\r