Skip to content

Commit aebdaa8

Browse files
plotnplotn
committed
repo fix
2 parents caf410b + 26014a1 commit aebdaa8

File tree

212 files changed

+309080
-163910
lines changed

Some content is hidden

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

212 files changed

+309080
-163910
lines changed

‎.gitignore‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
*.*~
2+
<<<<<<< HEAD
3+
=======
4+
.DS_*
5+
._*
6+
>>>>>>> upstream/master
27
qtbuild
38
v3build
49
v5build
@@ -8,3 +13,17 @@ qt-build
813
qtcreator-build
914
CMakeLists.txt.user
1015
*~
16+
<<<<<<< HEAD
17+
=======
18+
*.a
19+
*.so
20+
cr3gui/data/desktop/
21+
cr3gui/data/devices/
22+
cr3gui/data/manual/
23+
cr3gui/data/cr3.css
24+
cr3gui/data/cr3.ini
25+
cr3gui/data/dict/
26+
cr3gui/data/dict_ext
27+
cr3gui/data/tessdata/
28+
29+
>>>>>>> upstream/master

‎android/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ obj
66
*.iml
77
.gradle
88
/local.properties
9+
<<<<<<< HEAD
910
/.idea
11+
=======
12+
>>>>>>> upstream/master
1013
/.idea/workspace.xml
1114
/.idea/libraries
1215
/.idea/misc.xml

‎android/.idea/codeStyles/Project.xml‎

Lines changed: 122 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/gradle.xml‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/modules.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/runConfigurations.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/app/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/build
22
.externalNativeBuild
3+
<<<<<<< HEAD
34
/.externalNativeBuild
45
.cxx
56
/.cxx
67
/debug
78
.idea
89
/.idea
910
/release
10-
/release_minsize
11+
/release_minsize
12+
=======
13+
>>>>>>> upstream/master

‎android/app/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)