Fix more getters and a few typos

jeremyletang / rgtk

GTK+ bindings and wrappers for Rust (DEPRECATED SEE https://github.com/rust-gnome )

GNU Lesser General Public License v3.0

120 stars 22 forks source link

Closed oakes closed 10 years ago

GuillaumeGomez commented 10 years ago

Please rebase on master before I merge it.

oakes commented 10 years ago

I just merged master. Not experienced with rebase...

GuillaumeGomez commented 10 years ago

Well, that's actually pretty easy. We'll do an example with this repo :

> git remote add upstream https://github.com/jeremyletang/rgtk.git
> git fetch upstream
> git rebase -i upstream/master

And then, if you have conflicts, just do :

> git status

And check what's we every "both modified" files. After you solved conflicts, do :

> git rebase --continue

Until it's working.