Skip to content

Commit 8cc4694

Browse files
author
Michael Williamson
committed
Merge branch 'master' of https://github.com/pubnub/java
Conflicts: java/pom.xml
2 parents 09c16ce + cfdf5fb commit 8cc4694

100 files changed

Lines changed: 10050 additions & 1203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
6-25-14 - 3.6.1 - baee5
2+
. Fixed issue where a socket closed exception was thrown in some cases with presence
3+
. Added storage-optional publish flag
4+
. Added history return with TT
5+
16
3-13-14 3.6.0
27
. new Presence features support
38

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.0
1+
3.6.3

‎android/Pubnub-Android-3.6.0.jar‎

-55.6 KB
Binary file not shown.

‎android/Pubnub-Android-3.6.3.jar‎

62.5 KB
Binary file not shown.

‎android/Pubnub-Android-Debug-3.6.0.jar‎

-73.9 KB
Binary file not shown.

‎android/Pubnub-Android-Debug-3.6.3.jar‎

83.5 KB
Binary file not shown.

‎android/docs/allclasses-frame.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!--NewPage-->
3+
<HTML>
4+
<HEAD>
5+
<!-- Generated by javadoc (build 1.6.0_37) on Sat May 31 13:33:47 IST 2014 -->
6+
<TITLE>
7+
All Classes
8+
</TITLE>
9+
10+
<META NAME="date" CONTENT="2014-05-31">
11+
12+
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13+
14+
15+
</HEAD>
16+
17+
<BODY BGCOLOR="white">
18+
<FONT size="+1" CLASS="FrameHeadingFont">
19+
<B>All Classes</B></FONT>
20+
<BR>
21+
22+
<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
23+
<TR>
24+
<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api" target="classFrame">Pubnub</A>
25+
<BR>
26+
</FONT></TD>
27+
</TR>
28+
</TABLE>
29+
30+
</BODY>
31+
</HTML>

‎android/docs/allclasses-noframe.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!--NewPage-->
3+
<HTML>
4+
<HEAD>
5+
<!-- Generated by javadoc (build 1.6.0_37) on Sat May 31 13:33:47 IST 2014 -->
6+
<TITLE>
7+
All Classes
8+
</TITLE>
9+
10+
<META NAME="date" CONTENT="2014-05-31">
11+
12+
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13+
14+
15+
</HEAD>
16+
17+
<BODY BGCOLOR="white">
18+
<FONT size="+1" CLASS="FrameHeadingFont">
19+
<B>All Classes</B></FONT>
20+
<BR>
21+
22+
<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
23+
<TR>
24+
<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api">Pubnub</A>
25+
<BR>
26+
</FONT></TD>
27+
</TR>
28+
</TABLE>
29+
30+
</BODY>
31+
</HTML>

0 commit comments

Comments
 (0)