Skip to content

Commit 3b20004

Browse files
author
Devendra
committed
fixed merge conflicts
2 parents fe93a2e + c8df638 commit 3b20004

31 files changed

Lines changed: 525 additions & 33 deletions

android/Pubnub-Android-3.5.6.jar

325 Bytes
Binary file not shown.
325 Bytes
Binary file not shown.
325 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
-37 Bytes
Binary file not shown.

j2me/Pubnub-MicroEdition-3.5.6.jar

0 Bytes
Binary file not shown.
325 Bytes
Binary file not shown.

java/doc/allclasses-frame.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--NewPage-->
33
<HTML>
44
<HEAD>
5-
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 12:49:17 IST 2013 -->
5+
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 13:38:01 IST 2013 -->
66
<TITLE>
77
All Classes
88
</TITLE>
@@ -27,6 +27,8 @@
2727
<BR>
2828
<A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api" target="classFrame">Pubnub</A>
2929
<BR>
30+
<A HREF="com/pubnub/api/PubnubCrypto.html" title="class in com.pubnub.api" target="classFrame">PubnubCrypto</A>
31+
<BR>
3032
<A HREF="com/pubnub/api/PubnubError.html" title="class in com.pubnub.api" target="classFrame">PubnubError</A>
3133
<BR>
3234
<A HREF="com/pubnub/api/PubnubException.html" title="class in com.pubnub.api" target="classFrame">PubnubException</A>

java/doc/allclasses-noframe.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--NewPage-->
33
<HTML>
44
<HEAD>
5-
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 12:49:17 IST 2013 -->
5+
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 13:38:01 IST 2013 -->
66
<TITLE>
77
All Classes
88
</TITLE>
@@ -27,6 +27,8 @@
2727
<BR>
2828
<A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api">Pubnub</A>
2929
<BR>
30+
<A HREF="com/pubnub/api/PubnubCrypto.html" title="class in com.pubnub.api">PubnubCrypto</A>
31+
<BR>
3032
<A HREF="com/pubnub/api/PubnubError.html" title="class in com.pubnub.api">PubnubError</A>
3133
<BR>
3234
<A HREF="com/pubnub/api/PubnubException.html" title="class in com.pubnub.api">PubnubException</A>

java/doc/com/pubnub/api/Callback.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--NewPage-->
33
<HTML>
44
<HEAD>
5-
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 12:49:16 IST 2013 -->
5+
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 13:38:00 IST 2013 -->
66
<TITLE>
77
Callback
88
</TITLE>

0 commit comments

Comments
 (0)