forked from MyRobotLab/myrobotlab
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/MyRobotLab/myrobotlab.git
into develop Conflicts: src/org/myrobotlab/service/Runtime.java
- Loading branch information
Showing
3,193 changed files
with
984,103 additions
and
983,873 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,6 +46,3 @@ | |
| /opennlp/ | ||
| Thumbs.db | ||
| /cachedir/ | ||
| /assets/ | ||
| /init/ | ||
| /mimic/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>myrobotlab</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.python.pydev.PyDevBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> | ||
| <nature>org.python.pydev.pythonNature</nature> | ||
| </natures> | ||
| </projectDescription> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>myrobotlab</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.python.pydev.PyDevBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> | ||
| <nature>org.python.pydev.pythonNature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| # use https://lint.travis-ci.org/ to check validity | ||
| # use https://gist.github.com/tgrrtt/96b206c22b82f92ce563 to see examples | ||
| # env: | ||
| language: java | ||
| sudo: false | ||
| script: ant dist | ||
| jdk: | ||
| - oraclejdk8 | ||
|
|
||
| # whitelist | ||
| # branches: | ||
| # only: | ||
| # - develop | ||
|
|
||
| deploy: | ||
| provider: s3 | ||
| deployment_group: s3 group | ||
| on: | ||
| # experiment to 'always' deploy so the results of junit can always be seen | ||
| # even if they fail | ||
| # condition: true | ||
| all_branches: true | ||
| access_key_id: AKIAJGL6AEN37LDO3N7A | ||
| secret_access_key: | ||
| secure: W8HJgOUEt/d+C+1zeD+Znum0Yso8LLZ9eV8rUrYH2MIVl5dCcH+WaGwhLompNOAUbWYhjcr8Rn/SLqvCEcVWe651R4pwHiD0KNfDUwp907Ic/efluCd/T6RjCG7pjbE5bdPIeZjyupMcZMHU4aW7YN6QE1UlVPhDFKQlU84iGsc= | ||
| bucket: mrl-bucket-01 | ||
| skip_cleanup: true | ||
| # upload-dir: current | ||
| # travis will only copy 1 dir | ||
| local_dir: dist | ||
| # local_dir: build/report | ||
| acl: 'public_read' | ||
|
|
||
| # use https://lint.travis-ci.org/ to check validity | ||
| # use https://gist.github.com/tgrrtt/96b206c22b82f92ce563 to see examples | ||
| # env: | ||
| language: java | ||
| sudo: false | ||
| script: ant dist | ||
| jdk: | ||
| - oraclejdk8 | ||
|
|
||
| # whitelist | ||
| # branches: | ||
| # only: | ||
| # - develop | ||
|
|
||
| deploy: | ||
| provider: s3 | ||
| deployment_group: s3 group | ||
| on: | ||
| # experiment to 'always' deploy so the results of junit can always be seen | ||
| # even if they fail | ||
| # condition: true | ||
| all_branches: true | ||
| access_key_id: AKIAJGL6AEN37LDO3N7A | ||
| secret_access_key: | ||
| secure: W8HJgOUEt/d+C+1zeD+Znum0Yso8LLZ9eV8rUrYH2MIVl5dCcH+WaGwhLompNOAUbWYhjcr8Rn/SLqvCEcVWe651R4pwHiD0KNfDUwp907Ic/efluCd/T6RjCG7pjbE5bdPIeZjyupMcZMHU4aW7YN6QE1UlVPhDFKQlU84iGsc= | ||
| bucket: mrl-bucket-01 | ||
| skip_cleanup: true | ||
| # upload-dir: current | ||
| # travis will only copy 1 dir | ||
| local_dir: dist | ||
| # local_dir: build/report | ||
| acl: 'public_read' | ||
|
|
||
|
|
Oops, something went wrong.