Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion

Conflicts:
	code/panes.js
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
This commit is contained in:
Philipp Schaefer
2015-01-24 12:33:14 +01:00
3 changed files with 3 additions and 6 deletions

View File

@ -7,10 +7,9 @@ window.show = function(id) {
switch(id) {
case 'all':
window.chat.show('all');
break;
case 'faction':
window.chat.show('faction');
case 'alerts':
window.chat.show(id);
break;
case 'alerts':
window.chat.show('alerts');