search

gtorrent / gtorrent-gtk

Gtk client built on gtorrent-core
GNU General Public License v3.0
30 stars 9 forks source link

FileView #88

Closed nyanpasu closed 10 years ago

nyanpasu commented 10 years ago

For @infoburp

infoburp commented 10 years ago

Note to self: git pull only pulls the branch you are on

infoburp commented 10 years ago

thanks linus

benwaffle commented 10 years ago

merge master -> wip/fileview

nyanpasu commented 10 years ago

@benwaffle But fileview is already up-to-date with master. Did you mean wip/looks-familiar?

fuyukaidesu commented 10 years ago

... No merge conflicts... What ?

fuyukaidesu commented 10 years ago

Oh, I thought we were merging into master. Can't you merge manually ?

infoburp commented 10 years ago

I'm going to close this because it muddies the waters, thanks for the advice, inuoppai