Merge branch 'master' of https://github.com/juliandescottes/piskel

src/js/controller/piskel/PublicPiskelController.js

@@ -44,7 +44,7 @@
   };
 
   ns.PublicPiskelController.prototype.duplicateCurrentFrame = function () {
-    this.piskelController.duplicateFrameAt(this.getCurrentFrameIndex());
+    this.duplicateFrameAt(this.getCurrentFrameIndex());
   };
 
   ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) {

src/templates/settings/resize.html

@@ -4,7 +4,6 @@
   </div>
   <div class="settings-item">
     <form action="" method="POST" name="resize-form">
-      <span class="resize-warning-message">Existing frames will be cropped !</span>
       <div class="resize-section">
         <span class="resize-section-title  resize-section-title-small">Size :</span>
         <input type="text" class="textfield resize-size-field" name="resize-width"/>x