diff --git a/AUTHORS b/AUTHORS index 16ad14ff..9bfd0994 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ contributions of the following people: Federico Hernandez (Principal Author) Dirk Deimeke (Technical Advisor) Tomas Babej (Contributing Author) + Thomas Lauf The following submitted code, packages or analysis, and deserve special thanks: @@ -20,7 +21,6 @@ The following submitted code, packages or analysis, and deserve special thanks: Felix Wolfsteller Jörg Krause Richard Brown - Thomas Lauf Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 180d9572..4cc71c05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ branch where your changes must go. If you see two branches, `1.2.3` and Any patch against `master`, or an older development branch, means additional merge work for maintainers, and will not be accepted. If your change is on the -wrong branch, rebase it onto the right branch. Then retest. +wrong branch, rebase it onto the right branch. Then retest before submitting. By contributing a patch, you are declaring that you have the right to submit the code under the project licensing terms. @@ -60,7 +60,7 @@ contribute that may not be immediately obvious to you: the work is done well and doesn't create other problems or introduce new dependencies. We recommend talking to us before starting. Seriously. - - Add unit tests. Unit tests are possibly the most useful contributions of + - Add unit tests. Unit tests are likely the most useful contributions of all, because they not only improve the quality of the code, but prevent future regressions, therefore maintaining quality of subsequent releases. Plus, broken tests are a great motivator for us to fix the causal defect. @@ -92,7 +92,8 @@ How to make a patch Clone the repository from the right place. Do not clone from our github mirror, we don't use it. Do not patch the contents of one of our tarballs. - $ git clone https://git.tasktools.org/scm/tm/timew.git + $ git clone https://git.tasktools.org/scm/tm/timew.git timew.git + $ cd timew.git Find the latest development branch, and checkout. @@ -103,6 +104,8 @@ Find the latest development branch, and checkout. remotes/origin/HEAD -> origin/master remotes/origin/master $ git checkout 1.2.4 + $ git submodule init + $ git submodule update Prepare your fix. Use a commit message that matches the prevailing format. See 'git log' for examples. diff --git a/INSTALL b/INSTALL index 6e41403c..5733a8c0 100644 --- a/INSTALL +++ b/INSTALL @@ -14,8 +14,8 @@ In order to build Timewarrior, you will need: - make You will need a C++ compiler that supports full C++11, which includes: - - gcc 4.7 (released 2012-03-23) - - clang 3.3 (released 2013-01-07) + - gcc 4.9 (released 2014-04-22) + - clang 3.4 (released 2014-01-02) Basic Installation diff --git a/README.md b/README.md index 7ddd7d4b..0f4ab9f6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Thank you for taking a look at Timewarrior! Timewarrior is a time tracking utility that offers simple stopwatch features as well as sophisticated calendar-base backfill, along with flexible reporting. It -is a portable, well supported and very active, Open Source project. +is a portable, well supported and very active Open Source project. Although Timewarrior is a new project there is extensive online documentation. You'll find all the details at: