mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/Documentation
History
Dirk Hohndel f1f02941c7 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
2015-02-19 19:44:37 -08:00
..
50-pot Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
fr/po Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
images User manual: small updates 2015-02-10 15:06:36 -08:00
compact_subsurface.css Usermanual final edit before Version 4.0 2013-12-13 13:02:42 -08:00
FAQ.wordpress Update FAQ 2015-02-08 12:40:42 -08:00
make_PO_to_ASCIIDOC.sh Add POT/PO infrastructure to translate user manual. 2015-01-15 07:34:17 +13:00
make_POT.sh Add POT/PO infrastructure to translate user manual. 2015-01-15 07:34:17 +13:00
Makefile Documentation: Add initial support for French translation 2015-01-15 09:02:29 +13:00
user-manual.html.git Update html files for user manual to latest versions 2015-02-17 08:57:53 -08:00
user-manual.txt Rename the tab "Dive info" to "Info", and "Dive notes" to "Notes" 2015-02-14 11:18:53 -08:00
user-manual_es.html.git Update html files for user manual to latest versions 2015-02-17 08:57:53 -08:00
user-manual_es.txt Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
user-manual_fr.html.git Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
user-manual_fr.txt Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
user-manual_ru.html.git Merge branch 'v4.4-branch' back into master 2015-02-19 19:44:37 -08:00
user-manual_ru.txt Update russian translation of user manual (7b44cf2) 2015-02-10 15:07:25 -08:00