Merge pull request #20 from aochagavia/lock

Don't ignore Cargo.lock and fix a SDL2 version
pcwalton · Feb 23, 2016 · 8be11de · 8be11de
2 parents 6e91570 + 7c7276d
commit 8be11de
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 /target
-/Cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ authors = [ "pcwalton@mimiga.net" ]
 name = "nes"
 
 [dependencies]
-sdl2 = "*"
+sdl2 = "0.6.1"
 time = "*"
 libc = "*"
 lazy_static = "*"