4 commits

Author	SHA1	Message	Date
Daniel Flanagan	992fe1dae9	fix merge	2016-08-10 12:17:13 -05:00
Daniel Flanagan	c282a2de94	remove last line in reload xresources sccript	2016-08-10 12:16:53 -05:00
Daniel Flanagan	95f7c4be5c	browser stuff, xresources	2016-08-10 12:13:05 -05:00
Daniel Flanagan	6f11901655	various updates	2016-07-14 15:22:19 -05:00