Ryan Sullivan 63c0f11458 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	auto/gui.files.go

2014-05-21 15:15:37 -04:00

..

doc.go

Package descriptions for godoc

2014-03-12 06:32:26 +01:00

gui.files.go

Merge remote-tracking branch 'upstream/master'

2014-05-21 15:15:37 -04:00