Skip to content

Commit e3098e0

Browse files
committed
Merge pull request #66 from adjust/callbacks
Callbacks
2 parents b402572 + b6f88c8 commit e3098e0

Some content is hidden

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

53 files changed

+3018
-1348
lines changed

.gitignore

+66-27
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,32 @@ ExportedObj/
2121
nuget
2222
*.nupkg
2323

24-
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
24+
# ====================================================================== #
25+
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs) #
26+
# ====================================================================== #
2527
[Bb]in/
2628
[Oo]bj/
2729

28-
# mstest test results
30+
# =================== #
31+
# mstest test results #
32+
# =================== #
2933
TestResults
3034

31-
## Ignore Visual Studio temporary files, build results, and
32-
## files generated by popular Visual Studio add-ons.
35+
# ========================================================= #
36+
# Ignore Visual Studio temporary files, build results, and #
37+
# files generated by popular Visual Studio add-ons. #
38+
# ========================================================= #
3339

34-
# User-specific files
40+
# =================== #
41+
# User-specific files #
42+
# =================== #
3543
*.suo
3644
*.user
3745
*.sln.docstates
3846

39-
# Build results
47+
# ============= #
48+
# Build results #
49+
# ============= #
4050
[Dd]ebug/
4151
[Rr]elease/
4252
x64/
@@ -59,32 +69,46 @@ x64/
5969
*.vssscc
6070
.builds
6171

62-
# Visual C++ cache files
72+
# ====================== #
73+
# Visual C++ cache files #
74+
# ====================== #
6375
ipch/
6476
*.aps
6577
*.ncb
6678
*.opensdf
6779
*.sdf
6880

69-
# Visual Studio profiler
81+
# ====================== #
82+
# Visual Studio profiler #
83+
# ====================== #
7084
*.psess
7185
*.vsp
7286
*.vspx
7387

74-
# Guidance Automation Toolkit
88+
# =========================== #
89+
# Guidance Automation Toolkit #
90+
# =========================== #
7591
*.gpState
7692

77-
# ReSharper is a .NET coding add-in
93+
# ================================= #
94+
# ReSharper is a .NET coding add-in #
95+
# ================================= #
7896
_ReSharper*
7997

80-
# NCrunch
98+
# ======= #
99+
# NCrunch #
100+
# ======= #
81101
*.ncrunch*
82102
.*crunch*.local.xml
83103

84-
# Installshield output folder
104+
# =========================== #
105+
# Installshield output folder #
106+
# =========================== #
85107
[Ee]xpress
86108

87-
# DocProject is a documentation generator add-in
109+
# ============================================== #
110+
# DocProject is a documentation generator add-in #
111+
# ============================================== #
88112
DocProject/buildhelp/
89113
DocProject/Help/*.HxT
90114
DocProject/Help/*.HxC
@@ -94,23 +118,35 @@ DocProject/Help/*.hhp
94118
DocProject/Help/Html2
95119
DocProject/Help/html
96120

97-
# Click-Once directory
121+
# ==================== #
122+
# Click-Once directory #
123+
# ==================== #
98124
publish
99125

100-
# Publish Web Output
126+
# ================== #
127+
# Publish Web Output #
128+
# ================== #
101129
*.Publish.xml
102130

103-
# NuGet Packages Directory
131+
# ======================== #
132+
# NuGet Packages Directory #
133+
# ======================== #
104134
packages
105135

106-
# Windows Azure Build Output
136+
# ========================== #
137+
# Windows Azure Build Output #
138+
# ========================== #
107139
csx
108140
*.build.csdef
109141

110-
# Windows Store app package directory
142+
# =================================== #
143+
# Windows Store app package directory #
144+
# =================================== #
111145
AppPackages/
112146

113-
# Others
147+
# ====== #
148+
# Others #
149+
# ====== #
114150
[Bb]in
115151
[Oo]bj
116152
sql
@@ -123,8 +159,10 @@ ClientBin
123159
*.dbmdl
124160
Generated_Code #added for RIA/Silverlight projects
125161

126-
# Backup & report files from converting an old project file to a newer
127-
# Visual Studio version. Backup files are not needed, because we have git ;-)
162+
# =========================================================================== #
163+
# Backup & report files from converting an old project file to a newer #
164+
# Visual Studio version. Backup files are not needed, because we have git ;-) #
165+
# =========================================================================== #
128166
_UpgradeReport_Files/
129167
Backup*/
130168
UpgradeLog*.XML
@@ -151,14 +189,15 @@ MetroTestCertificate.pfx*
151189
src/
152190
src.meta
153191
ProjectSettings/
192+
Scripts/Unity4Assets
154193

155-
# ==================== #
156-
# Unity Project necessary
157-
# ==================== #
194+
# ======================= #
195+
# Unity Project necessary #
196+
# ======================= #
158197
Assembly-CSharp*
159198
unity_sdk*.sln
160199

161-
# ==================== #
162-
# Exceptions
163-
# ==================== #
200+
# ========== #
201+
# Exceptions #
202+
# ========== #
164203
!google-play-services_lib/AndroidManifest.xml

Assets/Adjust/3rd Party/SimpleJSON.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
using System.Linq;
4949

5050

51-
namespace SimpleJSON
51+
namespace com.adjust.sdk
5252
{
5353
public enum JSONBinaryTag
5454
{

0 commit comments

Comments
 (0)