Zixaphir b0e1748f0c Merge branch 'v3' into Av2 ...

Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	css/style.css
	package.json
	src/features.coffee
	src/main.coffee
	src/qr.coffee

2013-04-16 14:16:49 -07:00

..

crx

Merge branch 'v3' into Av2

2013-04-16 14:16:49 -07:00

4chan-X.js

Add an example to Custom Navigation.

2013-04-16 11:09:16 -07:00

4chan-X.meta.js

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

2013-04-15 23:11:22 -07:00

4chan-X.user.js

Add an example to Custom Navigation.

2013-04-16 11:09:16 -07:00

appchan-x.js

Merge branch 'v3' into Av2

2013-04-16 14:16:49 -07:00

appchan-x.meta.js

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

appchan-x.user.js

Merge branch 'v3' into Av2

2013-04-16 14:16:49 -07:00

appchan-x.zip

Merge branch 'v3' into Av2

2013-04-16 14:16:49 -07:00

crx.crx

Merge branch 'v3' into Av2

2013-04-16 14:16:49 -07:00