merge
diff --git a/Makefile b/Makefile
index ca5d4da..c0b481f 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@
ECHO = echo
ECHO_N = echo -n
JAVA = java
-PGVERSION = 1.8.1
+PGVERSION = 1.9.0
UNAME := $(shell uname)
NAME = `$(CAT) framework/appinfo.json | $(GREP) '"id"' | $(CUT) -d \" -f 4`
diff --git a/VERSION b/VERSION
index b9268da..abb1658 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.1
\ No newline at end of file
+1.9.0
\ No newline at end of file
diff --git a/framework/appinfo.json b/framework/appinfo.json
index 886aa24..c66cf24 100644
--- a/framework/appinfo.json
+++ b/framework/appinfo.json
@@ -1,7 +1,7 @@
{
"id": "org.apache.cordova.webos",
"version": "0.0.1",
- "vendor": "Palm",
+ "vendor": "HP",
"type": "web",
"main": "index.html",
"title": "Cordova WebOS",
diff --git a/framework/index.html b/framework/index.html
index a9bb048..7b84685 100644
--- a/framework/index.html
+++ b/framework/index.html
@@ -37,7 +37,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>cordova WebOS</title>
- <script type="text/javascript" src="cordova-1.8.1.js"></script>
+ <script type="text/javascript" src="cordova-1.9.0.js"></script>
<script type="text/javascript">
// create global var for sqlite database instance
var db;
