diff --git a/.gitignore b/.gitignore index 26a62dc..a2a2e86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,24 @@ -# ---> Actionscript -# Build and Release Folders -bin-debug/ -bin-release/ -[Oo]bj/ -[Bb]in/ +# ---> Java +# Compiled class file +*.class -# Other files and folders -.settings/ +# Log file +*.log -# Executables -*.swf -*.air -*.ipa -*.apk +# BlueJ files +*.ctxt -# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties` -# should NOT be excluded as they contain compiler settings and other important -# information for Eclipse / Flash Builder. +# Mobile Tools for Java (J2ME) +.mtj.tmp/ +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/LICENSE b/LICENSE index e9d84ae..204b93d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,19 @@ -Copyright (C) 2006 by Rob Landley +MIT License Copyright (c) -Permission to use, copy, modify, and/or distribute this software for any purpose -with or without fee is hereby granted. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index c6bb9e6..3e6c0fa 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ touch README.md git init git add README.md git commit -m "first commit" -git remote add origin https://git.trustie.net/moshenglv/test.git +git remote add origin https://bdgit.educoder.net/m53297601/java_ci.git git push -u origin master ``` @@ -13,8 +13,7 @@ git push -u origin master #### 从命令行推送已经创建的仓库 ```bash -git remote add origin https://git.trustie.net/moshenglv/test.git +git remote add origin https://bdgit.educoder.net/m53297601/java_ci.git git push -u origin master ``` -