From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 25 Mar 2014 09:14:28 +0000 (+0800)
Subject: Merge branch 'master' of try.gogits.org:lunny/gogs
X-Git-Tag: v0.9.99~2345
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5bfad6867d1bfd94880a42356651a680920f598a;p=gitea.git

Merge branch 'master' of try.gogits.org:lunny/gogs

Conflicts:
	.gitignore
	LICENSE
---

5bfad6867d1bfd94880a42356651a680920f598a
diff --cc .gitignore
index 425f227c1a,6cd1df2b7a..0544836208
--- a/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,22 +1,35 @@@
 +gogs
 +*.exe
 +*.exe~
 +.DS_Store
 +*.db
 +*.log
 +custom/
 +data/
 +.vendor/
 +.idea/
 +*.iml
- public/img/avatar/
++public/img/avatar/
++
+ # Compiled Object files, Static and Dynamic libs (Shared Objects)
+ *.o
+ *.a
+ *.so
+ 
+ # Folders
+ _obj
+ _test
+ 
+ # Architecture specific extensions/prefixes
+ *.[568vq]
+ [568vq].out
+ 
+ *.cgo1.go
+ *.cgo2.c
+ _cgo_defun.c
+ _cgo_gotypes.go
+ _cgo_export.*
+ 
+ _testmain.go
+ 
 -*.exe
++*.exe
diff --cc LICENSE
index 7cecc2485f,3af16b0724..bd6517e2dd
--- a/LICENSE
+++ b/LICENSE
@@@ -1,19 -1,27 +1,27 @@@
- Copyright (c) 2011 Dmitriy Zaporozhets
+ Copyright (c) 2014
+ All rights reserved.
  
- 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:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
  
- 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.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ 
+ * Neither the name of the {organization} nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.