From: Bernie Innocenti <bernie@codewiz.org>
Date: Fri, 29 Sep 2017 22:57:59 +0000 (-0400)
Subject: Merge branch 'master' of ssh://codewiz.org/~/public_git/mandelwow
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a8aebfadf8f18928b3f8ced81a7f0d4a4421466d;p=mandelwow.git

Merge branch 'master' of ssh://codewiz.org/~/public_git/mandelwow
---

a8aebfadf8f18928b3f8ced81a7f0d4a4421466d
diff --cc Cargo.toml
index 9c1bd7f,36dedd8..c7f4875
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -12,12 -12,10 +12,10 @@@ opt-level = 
  
  [dependencies]
  cgmath = "*"
 -glium = "0.16.0"
 -glutin = "0.7.4"
 +glium = "0.17.0"
 +glutin = "0.9"
- genmesh = "0.4.1"
  image = { version = "0.14.0", features = ["png_codec"], optional = true }
  libxm = "1.0.0"
- obj = { version = "0.5", features = ["usegenmesh"] }
  rust-rocket = { path = "rust-rocket", optional = true }
  rand = "*"
  sdl2 = "*"