foudfou ae0f41e1e4 Merge branch 'im' ... Conflicts: src/defaults/preferences/prefs.js src/modules/FiretrayHandler.jsm src/modules/FiretrayMessaging.jsm src/modules/VersionChange.jsm src/modules/commons.js src/modules/linux/FiretrayStatusIcon.jsm src/modules/linux/FiretrayWindow.jsm		2012-09-04 00:25:29 +02:00
..
chrome	Merge branch 'im'	2012-09-04 00:25:29 +02:00
components	address comments from last review by Kris Maglione, mainly:	2012-09-03 01:51:32 +02:00
defaults/preferences	Merge branch 'im'	2012-09-04 00:25:29 +02:00
lib/linux	Makefile for firetray.so more portable (thx simonbcn)	2012-09-02 17:31:09 +02:00
modules	Merge branch 'im'	2012-09-04 00:25:29 +02:00
chrome.manifest	cleaning	2012-07-28 15:25:33 +02:00
install.rdf	ignore 'im' server types for now, we'll be handling them later.	2012-08-03 23:52:38 +02:00
LICENSE	cleaning	2011-08-27 17:40:27 +02:00
Makefile	address comments from last review by Kris Maglione, mainly:	2012-09-03 01:51:32 +02:00