Zixaphir 298b5d3270 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css

2013-08-16 03:39:33 -07:00

..

audio

Merge Zixaphir X

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

css

Merge branch 'v3'

2013-08-16 03:39:33 -07:00

html

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

img

Merge branch 'v3'

2013-08-16 03:39:33 -07:00

lib

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

meta

Unfortunately, I have no intention of supporting Chrum 26

2013-08-15 23:04:38 -07:00

Build.coffee

Merge in new thread watcher and change a few things

2013-08-13 00:03:29 -07:00

Config.coffee

Just in case

2013-08-16 02:47:35 -07:00

Get.coffee

Merge Zixaphir X

2013-08-14 03:12:10 -07:00

Globals.coffee

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

Header.coffee

Fix small issue while merging.

2013-08-15 23:13:57 -07:00

Main.coffee

Banner changing and title editing

2013-08-16 01:52:28 -07:00

Settings.coffee

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

UI.coffee

Merge branch 'v3'

2013-08-15 23:02:54 -07:00