diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-01-10 19:41:37 +0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-01-10 19:41:37 +0700 |
commit | ab830b1d4fff0c68f9cad37ab8d079277ab5ca33 (patch) | |
tree | 791f4448aa11566dd1ef095aacd59840828f0edf /statistics.c | |
parent | 6037be946f91930f97a7c01000e0951aed2b1b1a (diff) | |
parent | a15485874153336f416889c9cd31d620e89f1bd0 (diff) | |
download | subsurface-ab830b1d4fff0c68f9cad37ab8d079277ab5ca33.tar.gz |
Merge branch 'v4.0-branch'
Bring in the tag, the translations changes and edits preparing for 4.0.2
into master. This should make "git describe" on master create something
reasonably sensible...
Diffstat (limited to 'statistics.c')
0 files changed, 0 insertions, 0 deletions