Skip to content

Commit

Permalink
Merge branch 'release/2018.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
sfeilmeier committed Mar 14, 2018
2 parents f6b0c0e + 4a75206 commit 05282ed
Show file tree
Hide file tree
Showing 601 changed files with 40,822 additions and 33,867 deletions.
75 changes: 75 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Text files with LF eol
*.auth crlf=input
*.awk crlf=input
*.bnd crlf=input
*.bndrun crlf=input
*.c crlf=input ident
*.conf crlf=input
*.cpp crlf=input ident
*.css crlf=input
*.ddf crlf=input
*.ee crlf=input
*.gradle crlf=input
*.groovy crlf=input
*.h crlf=input ident
*.html crlf=input ident
*.java crlf=input ident
*.js crlf=input
*.lib crlf=input
*.md crlf=input
*.MF crlf=input
*.mf crlf=input
*.perm crlf=input
*.php crlf=input
*.pl crlf=input
*.pom crlf=input
*.prefs crlf=input
*.properties crlf=input
*.py crlf=input
*.schema crlf=input
*.SF crlf=input
*.sh crlf=input
*.tcl crlf=input
*.txt crlf=input
*.xml crlf=input
*.xsd crlf=input ident
*.xsl crlf=input
*.xslt crlf=input
*.yml crlf=input
.classpath crlf=input
.project crlf=input
gradlew crlf=input
packageinfo crlf=input
Makefile crlf=input
README crlf=input
LICENSE crlf=input

# No EOL translation
*.bat -crlf

# Binary. No EOL translation, no diff
*.ico binary
*.jpeg binary
*.jpg binary
*.png binary
*.crt binary
*.pdf binary
*.dll binary
*.jar binary
*.jnilib binary
*.so binary
*.zip binary
*.doc binary
*.ppt binary
*.xls binary
*.odg binary
*.odp binary
*.ods binary
*.odt binary
*.otg binary
*.otp binary
*.ots binary
*.ott binary
*.key binary
*.numbers binary
*.pages binary
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.DS_Store
.gradle/
/generated/
enroute.zip
.metadata
Empty file added .gitmodules
Empty file.
Binary file added .gradle-wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions .gradle-wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
sudo: false

language: java

jdk:
- oraclejdk8

install: ./gradlew --version

script: ./gradlew --continue
13 changes: 0 additions & 13 deletions backend/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions backend/.settings/org.eclipse.core.resources.prefs

This file was deleted.

409 changes: 0 additions & 409 deletions backend/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

119 changes: 0 additions & 119 deletions backend/.settings/org.eclipse.jdt.ui.prefs

This file was deleted.

28 changes: 0 additions & 28 deletions backend/OpenEMS-Backend (Dummy).launch

This file was deleted.

29 changes: 0 additions & 29 deletions backend/OpenEMS-Backend (File).launch

This file was deleted.

32 changes: 0 additions & 32 deletions backend/OpenEMS-Backend (Odoo-Test).launch

This file was deleted.

36 changes: 0 additions & 36 deletions backend/OpenEMS-Backend.launch

This file was deleted.

Loading

0 comments on commit 05282ed

Please sign in to comment.