Merge branch 'master' of git://github.com/xmaniac/phonegap into bb

blackberry/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="src" path="/.test.jdw"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/NET_RIM_BLACKBERRY"/>
 	<classpathentry kind="src" path=".tmp"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

blackberry/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>phone_gap</name>
+	<name>phonegap</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -11,13 +11,19 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.rim.eide.RIMIncrementalProjectBuilder</name>
+			<name>net.rim.eide.PreprocessBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.rim.eide.JavaIncrementalProjectBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>net.rim.eide.rimnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.rim.eide.PreprocessingNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>

blackberry/.settings/net.rim.eide.keys.Project.prefs

@@ -0,0 +1,3 @@
+#Fri May 15 15:56:25 CEST 2009
+RIM.BLACKBERRY.TYPE=COPY
+eclipse.preferences.version=1

blackberry/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,5 @@
-#Sun Oct 19 18:43:38 PDT 2008
+#Sat May 16 13:53:35 CEST 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.source=1.3

blackberry/phonegap.cso

@@ -0,0 +1,5 @@
+33000000=RIMAPPSA2
+52424200=RIM Blackberry Apps API
+52434300=RIM Crypto API - Certicom
+52434900=RIM Crypto API - Internal
+52435200=RIM Crypto API - RIM

blackberry/phonegap.jdp

@@ -0,0 +1,82 @@
+## RIM Java Development Environment
+# RIM Project file
+#
+# This file is generated and managed by BlackBerry developer tools.
+# It SHOULD NOT BE modified manually.
+#
+AddOn=0
+AlwaysBuild=0
+[AlxImports
+]
+AutoRestart=0
+[ClassProtection
+]
+[CustomBuildFiles
+]
+[CustomBuildRules
+]
+[DefFiles
+]
+[DependsOn
+]
+ExcludeFromBuildAll=0
+[Files
+src\com\nitobi\phonegap\api\Command.java
+src\com\nitobi\phonegap\api\CommandManager.java
+src\com\nitobi\phonegap\api\impl\CameraCommand.java
+src\com\nitobi\phonegap\api\impl\ContactsCommand.java
+src\com\nitobi\phonegap\api\impl\GeoLocationCommand.java
+src\com\nitobi\phonegap\api\impl\InitializationCommand.java
+src\com\nitobi\phonegap\api\impl\TelephonyCommand.java
+src\com\nitobi\phonegap\api\impl\VibrationCommand.java
+src\com\nitobi\phonegap\io\AsynchronousResourceFetcher.java
+src\com\nitobi\phonegap\io\Callback.java
+src\com\nitobi\phonegap\io\ConnectionManager.java
+src\com\nitobi\phonegap\io\QueueResourceFetcher.java
+src\com\nitobi\phonegap\model\Position.java
+src\com\nitobi\phonegap\PhoneGap.java
+src\www\js\camera.js
+src\www\js\contacts.js
+src\www\js\device.js
+src\www\js\geolocation.js
+src\www\js\position.js
+src\www\js\telephony.js
+src\www\test\camera.html
+src\www\test\contacts.html
+src\www\test\device.html
+src\www\test\images\0.png
+src\www\test\images\1.png
+src\www\test\images\2.png
+src\www\test\images\3.png
+src\www\test\images\4.png
+src\www\test\images\5.png
+src\www\test\index.html
+src\www\test\io.html
+src\www\test\location.html
+src\www\test\telephony.html
+src\www\test\vibration.html
+]
+HaveAlxImports=0
+HaveDefs=0
+HaveImports=0
+[Icons
+]
+[ImplicitRules
+]
+[Imports
+]
+Listing=0
+MidletClass=data:///www/test/index.html
+Options=-quiet
+OutputFileName=phonegap
+[PackageProtection
+]
+RibbonPosition=0
+[RolloverIcons
+]
+RunOnStartup=0
+StartupTier=7
+SystemModule=0
+Title=PhoneGap
+Type=0
+UserData=|src