Zixaphir 2c2a40c0c9 Merge branch 'v3' ...

Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee

2013-06-01 09:00:56 -07:00

..

audio

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

css

Merge branch 'v3'

2013-06-01 09:00:56 -07:00

html

Basically redo theme importing.

2013-05-28 05:15:58 -07:00

img

Merge branch 'v3'

2013-05-10 07:19:08 -07:00

lib

Merge branch 'v3'

2013-05-28 05:57:21 -07:00

meta

Merge branch 'v3'

2013-05-08 06:24:19 -07:00

Build.coffee

Mayhem X

2013-05-27 06:13:40 -07:00

Config.coffee

Merge branch 'v3'

2013-06-01 09:00:56 -07:00

Get.coffee

Mayhem X, update changelog

2013-05-20 15:13:06 -07:00

Globals.coffee

Simpler, easier to out-prioritize.

2013-06-01 06:26:08 -07:00

Header.coffee

Stop logging this.

2013-05-17 22:19:47 +02:00

Main.coffee

Merge branch 'v3'

2013-06-01 09:00:56 -07:00

Settings.coffee

cleaner return 2

2013-06-01 06:29:17 -07:00

UI.coffee

Merge branch 'v3'

2013-05-14 11:40:38 -07:00