Zixaphir 7396b327c8 Merge branch 'v3' into Av2 ...

Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/Monitoring/ThreadWatcher.coffee

2013-05-07 21:09:24 -07:00

..

crx

Merge branch 'v3' into Av2

2013-05-07 21:09:24 -07:00

appchan-x.js

Merge branch 'v3' into Av2

2013-05-07 21:09:24 -07:00

appchan-x.meta.js

Merge branch 'v3' into Av2

2013-05-07 19:16:02 -07:00

appchan-x.user.js

Merge branch 'v3' into Av2

2013-05-07 21:09:24 -07:00

crx.crx

crx

2013-05-03 12:17:04 -07:00

version

Fix #48

2013-05-03 15:16:40 -07:00