Merge branch 'master' into icons

This commit is contained in:
Zixaphir 2013-08-19 22:53:32 -07:00
commit 4b015dae9e
9 changed files with 13 additions and 10 deletions

View File

@ -1,3 +1,6 @@
### v2.3.5
*2013-08-19*
### v2.3.4 ### v2.3.4
*2013-08-18* *2013-08-18*

View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.3.4 - 2013-08-19 * appchan x - Version 2.3.5 - 2013-08-19
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name appchan x // @name appchan x
// @version 2.3.4 // @version 2.3.5
// @minGMVer 1.13 // @minGMVer 1.13
// @minFFVer 22 // @minFFVer 22
// @namespace zixaphir // @namespace zixaphir

View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name appchan x // @name appchan x
// @version 2.3.4 // @version 2.3.5
// @minGMVer 1.13 // @minGMVer 1.13
// @minFFVer 22 // @minFFVer 22
// @namespace zixaphir // @namespace zixaphir
@ -20,7 +20,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.3.4 - 2013-08-19 * appchan x - Version 2.3.5 - 2013-08-19
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -426,7 +426,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '2.3.4', VERSION: '2.3.5',
NAMESPACE: 'appchan_x.', NAMESPACE: 'appchan_x.',
TYPE: 'sfw', TYPE: 'sfw',
boards: {}, boards: {},

Binary file not shown.

View File

@ -1,6 +1,6 @@
{ {
"name": "appchan x", "name": "appchan x",
"version": "2.3.4", "version": "2.3.5",
"manifest_version": 2, "manifest_version": 2,
"description": "The most comprehensive 4chan userscript.", "description": "The most comprehensive 4chan userscript.",
"icons": { "icons": {

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.3.4 - 2013-08-19 * appchan x - Version 2.3.5 - 2013-08-19
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -408,7 +408,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '2.3.4', VERSION: '2.3.5',
NAMESPACE: 'appchan_x.', NAMESPACE: 'appchan_x.',
TYPE: 'sfw', TYPE: 'sfw',
boards: {}, boards: {},

View File

@ -1 +1 @@
postMessage({version:'2.3.4'},'*') postMessage({version:'2.3.5'},'*')

View File

@ -1,6 +1,6 @@
{ {
"name": "appchan-x", "name": "appchan-x",
"version": "2.3.4", "version": "2.3.5",
"description": "The most comprehensive 4chan userscript.", "description": "The most comprehensive 4chan userscript.",
"meta": { "meta": {
"name": "appchan x", "name": "appchan x",