Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/filmaj/phonegap
Browse files Browse the repository at this point in the history
  • Loading branch information
shazron committed Aug 27, 2009
2 parents 49f827c + d36b7ba commit 4dbf8ad
Show file tree
Hide file tree
Showing 57 changed files with 2,196 additions and 325 deletions.
12 changes: 3 additions & 9 deletions .gitignore
@@ -1,9 +1,3 @@
.DS_Store
.*.sw?
*.cso
tmp/
*.xcodeproj/* !*.xcodeproj/project.pbxproj
lib/iphone/phonegap-min.js
lib/iphone/phonegap.js
android/bin
android/gen
android/default.properties
android/bin/*
android/gen/*
4 changes: 4 additions & 0 deletions blackberry/.gitignore
@@ -0,0 +1,4 @@
.tmp
.settings
bin/*
.project.old
74 changes: 14 additions & 60 deletions blackberry/phonegap.jdp
Expand Up @@ -21,80 +21,35 @@ AutoRestart=0
]
ExcludeFromBuildAll=0
[Files
..\..\..\..\workspace_blackberry\phonegap\src\0.png
..\..\..\..\workspace_blackberry\phonegap\src\1.png
..\..\..\..\workspace_blackberry\phonegap\src\2.png
..\..\..\..\workspace_blackberry\phonegap\src\3.png
..\..\..\..\workspace_blackberry\phonegap\src\4.png
..\..\..\..\workspace_blackberry\phonegap\src\5.png
..\..\..\..\workspace_blackberry\phonegap\src\camera.html
..\..\..\..\workspace_blackberry\phonegap\src\camera.js
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\Command.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\CommandManager.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\CameraCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\ContactsCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\GeoLocationCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\InitializationCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\TelephonyCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\VibrationCommand.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\io\AsynchronousResourceFetcher.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\io\Callback.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\io\ConnectionManager.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\io\QueueResourceFetcher.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\model\Position.java
..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\PhoneGap.java
..\..\..\..\workspace_blackberry\phonegap\src\contacts.html
..\..\..\..\workspace_blackberry\phonegap\src\contacts.js
..\..\..\..\workspace_blackberry\phonegap\src\device.html
..\..\..\..\workspace_blackberry\phonegap\src\device.js
..\..\..\..\workspace_blackberry\phonegap\src\geolocation.js
..\..\..\..\workspace_blackberry\phonegap\src\index.html
..\..\..\..\workspace_blackberry\phonegap\src\io.html
..\..\..\..\workspace_blackberry\phonegap\src\location.html
..\..\..\..\workspace_blackberry\phonegap\src\position.js
..\..\..\..\workspace_blackberry\phonegap\src\telephony.html
..\..\..\..\workspace_blackberry\phonegap\src\telephony.js
..\..\..\..\workspace_blackberry\phonegap\src\vibration.html
..\..\..\..\workspace_blackberry\phonegap\src\www\js\camera.js
..\..\..\..\workspace_blackberry\phonegap\src\www\js\contacts.js
..\..\..\..\workspace_blackberry\phonegap\src\www\js\device.js
..\..\..\..\workspace_blackberry\phonegap\src\www\js\geolocation.js
..\..\..\..\workspace_blackberry\phonegap\src\www\js\position.js
..\..\..\..\workspace_blackberry\phonegap\src\www\js\telephony.js
..\..\..\..\workspace_blackberry\phonegap\src\www\test\camera.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\contacts.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\device.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\0.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\1.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\2.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\3.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\4.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\images\5.png
..\..\..\..\workspace_blackberry\phonegap\src\www\test\index.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\io.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\location.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\telephony.html
..\..\..\..\workspace_blackberry\phonegap\src\www\test\vibration.html
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\DeviceCommand.java
src\com\nitobi\phonegap\api\impl\GeoLocationCommand.java
src\com\nitobi\phonegap\api\impl\InitializationCommand.java
src\com\nitobi\phonegap\api\impl\MediaCommand.java
src\com\nitobi\phonegap\api\impl\NotificationCommand.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\HttpConnection.java
src\com\nitobi\phonegap\io\PrimaryResourceFetchThread.java
src\com\nitobi\phonegap\io\QueueResourceFetcher.java
src\com\nitobi\phonegap\io\SecondaryResourceFetchThread.java
src\com\nitobi\phonegap\model\Position.java
src\com\nitobi\phonegap\PhoneGap.java
src\www\css\test.css
src\www\js\camera.js
src\www\js\contacts.js
src\www\js\device.js
src\www\js\geolocation.js
src\www\js\media.js
src\www\js\notification.js
src\www\js\position.js
src\www\js\telephony.js
src\www\media\bird.mp3
src\www\media\percBass2.wav
src\www\test\camera.html
src\www\test\contacts.html
src\www\test\device.html
Expand All @@ -107,8 +62,9 @@ src\www\test\images\5.png
src\www\test\index.html
src\www\test\io.html
src\www\test\location.html
src\www\test\media.html
src\www\test\notification.html
src\www\test\telephony.html
src\www\test\vibration.html
]
HaveAlxImports=0
HaveDefs=0
Expand All @@ -120,9 +76,8 @@ HaveImports=0
[Imports
]
Listing=0
MidletClass=data:///www/test/index.html
Options=-quiet
OutputFileName=phonegap
OutputFileName=PhoneGapBB
[PackageProtection
]
RibbonPosition=0
Expand All @@ -131,6 +86,5 @@ RibbonPosition=0
RunOnStartup=0
StartupTier=7
SystemModule=0
Title=PhoneGap
Type=0
UserData=|src

0 comments on commit 4dbf8ad

Please sign in to comment.