Salvador Cuñat 3610c7b3b7 merge conflicts ... Backport to 4.4.1 because of unresolved merge conflicts from f1f0294 Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>		2015-02-22 07:46:28 -08:00
..
50-pot	Documentation: Merge/update french user-manual translation	2015-02-20 02:55:26 -08:00
fr/po	Documentation: Merge/update french user-manual translation	2015-02-20 02:55:26 -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 conflicts	2015-02-22 07:46:28 -08:00
user-manual_fr.html.git	Documentation: Merge/update french user-manual translation	2015-02-20 02:55:26 -08:00
user-manual_fr.txt	Documentation: Merge/update french user-manual translation	2015-02-20 02:55:26 -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