Zixaphir 966882c11d Merge branch 'v3' ...

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html

2014-01-12 15:26:45 -07:00

..

Advanced.html

Merge branch 'v3'

2014-01-12 15:26:45 -07:00

Batch-Mascot.html

More or less improve the mascot section code.

2013-05-08 05:35:52 -07:00

Batch-Theme.html

Basically redo theme importing.

2013-05-28 05:15:58 -07:00

Deleted-Theme.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00

Filter-guide.html

Merge -- probably bugged until I sort out everything

2013-11-22 17:25:06 -07:00

Filter-select.html

Merge Zixaphir X

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

Keybinds.html

Merge Zixaphir X

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

Mascot.html

Adapt silhouette code to generate silhouette Mascots

2013-09-04 15:11:55 -07:00

Sauce.html

Merge Zixaphir X

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

Settings.html

Redo FontAwesome stuff, I guess.

2013-11-23 13:23:36 -07:00

Theme.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00