merge xcode-6.3, update to use Swift 1.2 initialization changes

piemonte · Apr 17, 2015 · 5805c0d · 5805c0d
2 parents 7d70517 + 3d7433b
commit 5805c0d
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 71 deletions.
diff --git a/Project/Player/ViewController.swift b/Project/Player/ViewController.swift
@@ -34,8 +34,8 @@ class ViewController: UIViewController, PlayerDelegate {
 
     // MARK: object lifecycle
 
-    override init() {
-        super.init()
+    convenience init() {
+        self.init(nibName: nil, bundle:nil)
     }
 
     required init(coder aDecoder: NSCoder) {