diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .mailmap | 4 | ||||
| -rw-r--r-- | update-license.go | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 706d953bf..e5a5d2fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ .ethtest */**/*tx_database* */**/*dapps* +Godeps/_workspace/pkg +Godeps/_workspace/bin #* .#* @@ -21,7 +23,9 @@ .project .settings -cmd/ethereum/ethereum +geth +mist +cmd/geth/geth cmd/mist/mist deploy/osx/Mist.app deploy/osx/Mist\ Installer.dmg diff --git a/.gitmodules b/.gitmodules index 461a5a748..3284c329d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "ethereal/assets/samplecoin"] - path = ethereal/assets/samplecoin - url = git@github.com:obscuren/SampleCoin.git [submodule "cmd/mist/assets/ext/ethereum.js"] path = cmd/mist/assets/ext/ethereum.js url = https://github.com/ethereum/ethereum.js @@ -9,4 +9,6 @@ Joseph Goulden <joegoulden@gmail.com> Nick Savers <nicksavers@gmail.com> -Maran Hidskes <maran.hidskes@gmail.com>
\ No newline at end of file +Maran Hidskes <maran.hidskes@gmail.com> + +Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org> diff --git a/update-license.go b/update-license.go index 832a94712..e55732a53 100644 --- a/update-license.go +++ b/update-license.go @@ -40,7 +40,7 @@ var ( extensions = []string{".go", ".js", ".qml"} // paths with any of these prefixes will be skipped - skipPrefixes = []string{"tests/files/", "cmd/mist/assets/ext/", "cmd/mist/assets/muted/"} + skipPrefixes = []string{"Godeps/", "tests/files/", "cmd/mist/assets/ext/", "cmd/mist/assets/muted/"} // paths with this prefix are licensed as GPL. all other files are LGPL. gplPrefixes = []string{"cmd/"} @@ -190,7 +190,7 @@ func fileInfo(file string) (*info, error) { break } } - cmd := exec.Command("git", "log", "--follow", "--find-copies", "--pretty=format:%aI | %aN <%aE>", "--", file) + cmd := exec.Command("git", "log", "--follow", "--find-copies", "--pretty=format:%ai | %aN <%aE>", "--", file) err := doLines(cmd, func(line string) { sep := strings.IndexByte(line, '|') year, name := line[:4], line[sep+2:] |