Zixaphir f301f1c2c2 Merge branch 'v3' ...

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js

2014-01-21 13:59:05 -07:00

..

audio

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

css

Try to get some better errors out of QR.req.onerror

2014-01-19 15:18:57 -07:00

html

Merge branch 'v3'

2014-01-13 13:25:43 -07:00

img

Merge branch 'v3'

2014-01-12 15:26:45 -07:00

lib

Merge branch 'v3'

2014-01-18 20:01:02 -07:00

meta

Merge branch 'v3'

2013-11-23 12:56:42 -07:00

Build.coffee

Holy shit, it's working.

2014-01-09 23:41:58 -07:00

Cheats.coffee

Rethink our indexOf implementation

2014-01-13 12:08:53 -07:00

Config.coffee

Merge branch 'v3'

2014-01-13 19:36:02 -07:00

Get.coffee

Still hate switches.

2014-01-19 21:38:46 -07:00

Globals.coffee

Merge branch 'v3'

2014-01-17 13:23:36 -07:00

Header.coffee

Merge branch 'v3'

2014-01-13 19:36:02 -07:00

Index.coffee

Revert "Fix updating the context of threads and index"

2014-01-18 14:11:36 -07:00

Main.coffee

Merge branch 'v3'

2014-01-17 13:23:36 -07:00

Navigate.coffee

Ooops, didn't see that~

2014-01-18 20:09:02 -07:00

Settings.coffee

Looks like the import mascot code was broken anyways!

2014-01-14 02:04:23 -07:00

UI.coffee

Fix some hover issues caused by me being a n00b when I wrote them

2014-01-17 12:49:56 -07:00