Merge branch 'to-push' of github.com:nexushoratio/ingress-intel-total-conversion into to-push

Conflicts:
	plugins/portal-defense.user.js
	plugins/show-linked-portals.user.js
This commit is contained in:
Mike Castle
2013-12-02 02:18:03 -08:00
98 changed files with 11406 additions and 11373 deletions

View File

@ -1,17 +1,18 @@
// ==UserScript==
// @id iitc-plugin-defense@gluckies
// @name IITC plugin: portal defense
// @category Layer
// @category Deleted
// @version 0.2.2.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Shows the defense values of every portal (see also "hightlight portals total mitigation" highlighter)
// @description PLUGIN CURRENTLY UNAVAILABLE
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*
// @match http://www.ingress.com/intel*
// ==/UserScript==
<<<<<<< HEAD
@@PLUGINSTART@@
@ -169,3 +170,5 @@ var setup = function() {
// PLUGIN END //////////////////////////////////////////////////////////
@@PLUGINEND@@
=======
>>>>>>> 68ec278914ced792f20cbd133f9481d6078435a6