Merge branch 'master' of https://github.com/Coeuvre/rust-2048

Conflicts: src/app.rs
2014-08-18 09:45:48 +08:00 · 2014-08-18 09:45:48 +08:00 · a758b2efd4
commit a758b2efd4
parent d889cc44a3 f52a6a7e1f
1 changed files with 0 additions and 2 deletions
--- a/src/app.rs
+++ b/src/app.rs
@ -38,9 +38,7 @@ impl<'a> App<'a> {
            gl: Gl::new(),
        }
    }
-}

-impl<'a> App<'a> {
    fn render_ui(&mut self, c: &Context) {
        // logo
        c.trans(self.settings.board_padding, self.settings.board_padding)