Zixaphir 7a58008d0c Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/Miscellaneous/Emoji.coffee

2013-10-19 19:54:09 -07:00

..

audio

Merge Zixaphir X

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

css

Fix #470

2013-10-14 08:29:29 -07:00

html

Merge branch 'v3'

2013-10-13 14:42:58 -07:00

img

Merge branch 'v3'

2013-10-19 19:54:09 -07:00

lib

Merge branch 'v3'

2013-10-13 14:42:58 -07:00

meta

Merge branch 'v3'

2013-10-13 14:42:58 -07:00

Build.coffee

Just in case

2013-09-24 15:08:38 -07:00

Config.coffee

Infinite Scrolling

2013-10-19 19:45:35 -07:00

Get.coffee

Merge Mayhem X

2013-09-22 03:57:03 -07:00

Globals.coffee

Fix Asuka_Langley_Soryu_3 mascot

2013-10-13 14:53:06 -07:00

Header.coffee

Merge branch 'v3'

2013-08-24 13:57:27 -07:00

Main.coffee

softTask optimizations.

2013-10-19 19:46:26 -07:00

Settings.coffee

Adapt silhouette code to generate silhouette Mascots

2013-09-04 15:11:55 -07:00

UI.coffee

Merge Mayhem X

2013-09-22 03:57:03 -07:00