Anis Kadri ac509369e9 forgot to resolve conflict		2011-10-14 15:49:16 -07:00
..
phonegap.xml	forgot to resolve conflict	2011-10-14 15:49:16 -07:00
plugins.xml	Include plugin reference and permissions for battery events.	2011-08-11 15:37:11 -05:00