Skip to content

Commit ae24cb3

Browse files
committed
Merge branch 'dev'
2 parents 2e93f56 + 4bbfab5 commit ae24cb3

File tree

113 files changed

+657
-10983
lines changed

Some content is hidden

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

113 files changed

+657
-10983
lines changed

.gitignore

+2-25
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,9 @@ Builds/
3131
!default.mode2v3
3232
!default.perspectivev3
3333

34-
####
35-
# Xcode 4
36-
xcuserdata
37-
!xcschemes
38-
# Xcode 4
39-
*.moved-aside
40-
41-
####
42-
# XCode 4 workspaces - more detailed
43-
!xcshareddata
44-
!default.xcworkspace
45-
*.xcworkspacedata
46-
4734

48-
####
49-
# Xcode 5
50-
*.xccheckout
51-
*.xcuserstate
52-
53-
####
54-
# Xcode 7
55-
*.xcscmblueprint
56-
57-
####
58-
# AppCode
59-
.idea/
35+
xcuserdata
36+
xcshareddata
6037

6138
####
6239
# Other Xcode files

.travis.yml

-5
This file was deleted.

ISSUE_TEMPLATE.md

-45
This file was deleted.

Podfile

-31
This file was deleted.

Podfile.lock

-22
This file was deleted.

Pods/BRLOptionParser/BRLOptionParser/BRLOptionParser.h

-62
This file was deleted.

0 commit comments

Comments
 (0)