From 00b918b8000ef744b8a7af1a41f53fb7ab818070 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Thu, 16 Apr 2015 17:08:47 -0700
Subject: [PATCH] Update changelog and bump version to v1.2.4

---
 CHANGELOG.md         | 15 +++++++++++++++
 lib/player/player.js |  2 +-
 package.json         |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c85e59990c..5682104100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.2.4 (2015-04-16)
+
+Bugfixes backported from v1.3.0 to the v1.2.x branch.
+
+Bugfixes:
+  - Fixed FakeEventTarget exception handling.
+  - Fixed aggressive dead code stripping by the compiler.
+  - Fixed a bug in which subtitles were enabled by default without a subtitle
+    language match.
+
+Features:
+  - Added support for requireJS and improved support for commonJS.
+  - Improved documentation for Role tags and multilingual assets.
+
+
 ## 1.2.3 (2015-04-07)
 
 A roll-up of recent bugfixes.
diff --git a/lib/player/player.js b/lib/player/player.js
index 8d3ee50d82..d9e5b2f767 100644
--- a/lib/player/player.js
+++ b/lib/player/player.js
@@ -129,7 +129,7 @@ goog.inherits(shaka.player.Player, shaka.util.FakeEventTarget);
 /**
  * @define {string} A version number taken from git at compile time.
  */
-goog.define('GIT_VERSION', 'v1.2.3-debug');
+goog.define('GIT_VERSION', 'v1.2.4-debug');
 
 
 /**
diff --git a/package.json b/package.json
index f5433acda3..48048db51e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "homepage": "https://github.com/google/shaka-player",
   "author": "Google",
   "maintainers": [