fixing conflicts

yishai-glide · Jul 10, 2013 · 9f64ec9 · 9f64ec9
2 parents 89b32c1 + c555643
commit 9f64ec9
Show file tree

Hide file tree

Showing 30 changed files with 20 additions and 352 deletions.
diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar
diff --git a/codenameone/pubnub-codenameone-3.5.2.cn1lib b/codenameone/pubnub-codenameone-3.5.2.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar
diff --git a/java/Pubnub-StandardEdition-3.5.2.jar b/java/Pubnub-StandardEdition-3.5.2.jar
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:15 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>

diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:15 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>

diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:14 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>

diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:14 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>

diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:14 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:15 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:15 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:10:15 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>