Skip to content

Commit

Permalink
Incorporate recent OpenCV changes in ARC-Core (#1)
Browse files Browse the repository at this point in the history
* Updated the .gitignore

More useful .gitignore generated for Windows and Android Studio using gitignore.io

https://www.gitignore.io/

* Added macOS .gitignore settings

Used gitignore.io again

* Fixed and updated all of the gradle stuff to comply with the newer Android Studio versions

* Removing .idea syncing (1/2)

* Stop .idea syncing (Part 2/2)

* Added the DogeCV 2018 code as well as the DogeCV examples

* Stop .idea syncing(1/2)

* Changed the formatting to be more correct

* Fixed build.gradle
  • Loading branch information
broad-well authored Oct 5, 2018
1 parent 56cff27 commit c2bc442
Show file tree
Hide file tree
Showing 208 changed files with 19,578 additions and 9,771 deletions.
180 changes: 167 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,187 @@
# built application files

# Created by https://www.gitignore.io/api/macos,windows,androidstudio

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# generated files
# Generated files
bin/
gen/
out/

# Gradle files
.gradle
.gradle/
build/

# Signing files
.signing/

# Local configuration file (sdk path, etc)
local.properties

# Windows thumbnail db
Thumbs.db
# Proguard folder generated by Eclipse
proguard/

# OSX files
.DS_Store
# Log Files
*.log

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
captures/
.navigation/
*.ipr
*~
*.swp

# Android Patch
gen-external-apklibs

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# NDK
obj/

# IntelliJ IDEA
*.iml
.idea
<<<<<<< HEAD
.idea/*
.gradle
build/
=======
*.iws
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

# Legacy Eclipse project files
.classpath
.project
.cproject
.settings/

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.war
*.ear

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
hs_err_pid*

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### AndroidStudio Patch ###

!/gradle/wrapper/gradle-wrapper.jar

### macOS ###
# General
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.TemporaryItems
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Windows ###
# Windows thumbnail cache files
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk
>>>>>>> 391cf979453fa3dadabd15ff7e80a0ccd9a4d9e9

# Uniform code style
!.idea/codeStyles/*
*ASUS_PC_01*

.flooignore
.floo
gradle/wrapper/gradle-wrapper.properties
# End of https://www.gitignore.io/api/macos,windows,androidstudio
Loading

0 comments on commit c2bc442

Please sign in to comment.