Zixaphir 7fd7c249dc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 ...

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee

2013-08-18 10:24:51 -07:00

..

audio

Merge Zixaphir X

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

css

Some final tweaks to the icons

2013-08-18 04:43:26 -07:00

html

QR filename editing tweaks

2013-08-18 01:51:07 -07:00

img

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-17 20:33:48 -07:00

lib

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-17 21:00:31 -07:00

meta

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-17 21:00:31 -07:00

Build.coffee

Merge in new thread watcher and change a few things

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

Config.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-18 10:24:51 -07:00

Get.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-17 20:33:48 -07:00

Globals.coffee

Merge Zixaphir X

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

Header.coffee

Some shortcut icon tweaks

2013-08-18 03:42:25 -07:00

Main.coffee

We're just going to use the CSS we want, not the CSS provided.

2013-08-18 04:06:39 -07:00

Settings.coffee

We're just going to use the CSS we want, not the CSS provided.

2013-08-18 04:06:39 -07:00

UI.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-08-17 20:33:48 -07:00