Skip to content

Commit 2b83b31

Browse files
authored
Merge branch 'master' into master
2 parents 1dbbb23 + b33c778 commit 2b83b31

File tree

166 files changed

+4139
-31315
lines changed

Some content is hidden

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

166 files changed

+4139
-31315
lines changed

.gitignore

+35-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
1-
/bin/
2-
.idea/*
3-
.classpath*
4-
.project*
1+
/gradle/wrapper/gradle-wrapper.properties
2+
##----------Android----------
3+
# build
4+
*.apk
5+
*.ap_
6+
*.dex
7+
*.class
8+
bin/
9+
gen/
10+
build/
11+
out/
12+
13+
# gradle
14+
.gradle/
15+
gradle-app.setting
16+
!gradle-wrapper.jar
17+
build/
18+
19+
local.properties
20+
21+
##----------idea----------
522
*.iml
23+
.idea/
24+
*.ipr
25+
*.iws
26+
27+
# Android Studio Navigation editor temp files
28+
.navigation/
29+
30+
##----------Other----------
31+
# osx
32+
*~
33+
.DS_Store
34+
gradle.properties
35+
36+
.vscode
-859 Bytes
Binary file not shown.

Compression/bin/HEncoder$Node.class

-683 Bytes
Binary file not shown.

Compression/bin/HEncoder.class

-3.59 KB
Binary file not shown.

Compression/bin/compressclient.class

-756 Bytes
Binary file not shown.

Compression/bin/genericheap.class

-2.79 KB
Binary file not shown.

Compression/src/HEncoder.java

-108
This file was deleted.

Compression/src/compressclient.java

-11
This file was deleted.

Compression/src/genericheap.java

-93
This file was deleted.

0 commit comments

Comments
 (0)