diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-18 21:33:00 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-19 19:44:37 -0800 |
| commit | f1f02941c7a8e538db18e10f4937170024d3405e (patch) | |
| tree | 708cafb2bb85f373d2729fe3ed52a6d4c8025aee /.clang-format | |
| parent | aa7f2eeb8a1a46211b52b9c97e3f040c2f1a5ab8 (diff) | |
| parent | 554b652d25d9ce853c4f8f2044f80ab1b198fb1b (diff) | |
| download | subsurface-f1f02941c7a8e538db18e10f4937170024d3405e.tar.gz | |
Merge branch 'v4.4-branch' back into master
The manuals all will need a careful read.
The changes to use lsb-release and the PCLinuxOS specific files got lost
because I didn't want to try to rewite this in the middle of a merge.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
Documentation/50-pot/subsurface-manual.pot
Documentation/fr/po/subsurface-manual.fr.po
Documentation/user-manual.txt
Documentation/user-manual_es.txt
Documentation/user-manual_fr.html.git
Documentation/user-manual_fr.txt
Documentation/user-manual_ru.html.git
Documentation/user-manual_ru.txt
file.c
qthelper.cpp
subsurface.pro
subsurfacesysinfo.cpp
xslt/DiveLog.xslt
Diffstat (limited to '.clang-format')
0 files changed, 0 insertions, 0 deletions