Merge branch 'master' into pending

Author: GuillaumeGomez

.travis.yml

@@ -3,7 +3,7 @@ language: rust
 rust:
 - nightly
 - beta
-- stable
+- 1.28.0 # stable
 addons:
   apt:
     packages:

CONTRIBUTING.md

@@ -0,0 +1,5 @@
+# Contributing
+Contributors, you're welcome !
+
+## How-to
+For now, if you want to update or add an example, please create a pull request on the [pending branch](https://github.com/rust-gnome/examples/tree/pending). If your pull request targets the master branch, it won't be merged. Thanks !

Cargo.toml

@@ -8,31 +8,17 @@ autobins = false
 chrono = "0.4"
 url = "1.4"
 futures-preview = { version = "0.2", optional = true }
-
-[dependencies.atk]
-git = "https://github.com/gtk-rs/atk"
-
-[dependencies.glib]
-git = "https://github.com/gtk-rs/glib"
-
-[dependencies.gio]
-git = "https://github.com/gtk-rs/gio"
-
-[dependencies.cairo-rs]
-git = "https://github.com/gtk-rs/cairo"
-features = ["png"]
-
-[dependencies.pango]
-git = "https://github.com/gtk-rs/pango"
-
-[dependencies.gdk-pixbuf]
-git = "https://github.com/gtk-rs/gdk-pixbuf"
-
-[dependencies.gdk]
-git = "https://github.com/gtk-rs/gdk"
-
-[dependencies.gtk]
-git = "https://github.com/gtk-rs/gtk"
+atk = "^0"
+gobject-subclass = "^0"
+glib-sys = "^0"
+gobject-sys = "^0"
+glib = "^0"
+gio = "^0"
+gdk = "^0"
+gdk-pixbuf = "^0"
+gtk = "^0"
+pango = "^0"
+cairo-rs = { version = "^0", features = ["png"] }
 
 [features]
 #default = ["gtk_3_22_30", "futures-stable", "subclassing"]

README.md

@@ -1,4 +1,4 @@
-# gtk-rs examples [![Build Status](https://travis-ci.org/gtk-rs/examples.png?branch=master)](https://travis-ci.org/gtk-rs/examples) [![Build status](https://ci.appveyor.com/api/projects/status/glyf8yir9lh8mrh5?svg=true)](https://ci.appveyor.com/project/GuillaumeGomez/examples)
+# gtk-rs examples [![Build Status](https://travis-ci.org/gtk-rs/examples.png?branch=master)](https://travis-ci.org/gtk-rs/examples) [![Build status](https://ci.appveyor.com/api/projects/status/pi27a5xubp0ihl2d?svg=true)](https://ci.appveyor.com/project/GuillaumeGomez/examples)
 
 A few gtk-rs examples. To build, just do: