mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/subsurface-core
History
Salvador Cuñat ce3a78efca Assign lower number to a merged dive instead of higher one 
At the moment, if we have, say, dives ... 100, 101 and 102 and we merge 101 and
102, we get a list numbered ... 99, 100, 102. This is, probably, an
undesired behavior. The patch simple chooses lower of both dive numbers instead
of higher one.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:40:20 -08:00
..
android.cpp Android: go back to using Qt's DataLocation 2015-11-07 10:52:19 -08:00
checkcloudconnection.cpp Switch to compile time connect syntax 2015-12-01 15:34:00 -08:00
checkcloudconnection.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
CMakeLists.txt Location service: move into subsurface-core 2015-11-18 18:34:49 -08:00
cochran.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
cochran.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
color.cpp Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
color.h Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
configuredivecomputer.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputerthreads.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputerthreads.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
datatrak.c simple spelling changes 2015-11-15 12:10:37 -08:00
datatrak.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
deco.c Merge branch 'cmakeAndPreferences' 2015-11-02 19:54:34 -08:00
deco.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
device.c simple spelling changes 2015-11-15 12:10:37 -08:00
device.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
devicedetails.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
devicedetails.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
display.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
dive.c Assign lower number to a merged dive instead of higher one 2016-01-07 18:40:20 -08:00
dive.h Cloud storage: fix potential crash when avoiding reloading dive list 2016-01-04 17:55:37 -08:00
divecomputer.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divecomputer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelist.c Crash fix in add_single_dive. No writing to dive_table.dives[-1] 2015-12-03 22:56:54 -08:00
divelist.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelogexportlogic.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelogexportlogic.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesitehelpers.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesitehelpers.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
equipment.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
exif.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
exif.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
file.c Cloud storage: fix potential crash when avoiding reloading dive list 2016-01-04 17:55:37 -08:00
file.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gaspressures.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gaspressures.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettext.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettextfromc.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettextfromc.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
git-access.c Add option to not check the remote when loading from git storage 2015-12-27 10:06:33 -08:00
git-access.h Cloud storage: check the top commit without loading dives 2015-12-27 10:06:33 -08:00
gpslocation.cpp Location service: get the current position 2016-01-01 17:26:18 -08:00
gpslocation.h Location service: get the current position 2016-01-01 17:26:18 -08:00
helpers.h QML UI: handle editing of depth 2016-01-01 00:55:34 -08:00
imagedownloader.cpp Move ImageDownloader out of the desktop widgets 2015-11-06 11:30:11 -08:00
imagedownloader.h Move ImageDownloader out of the desktop widgets 2015-11-06 11:30:11 -08:00
isocialnetworkintegration.cpp Removed unused files 2015-11-09 18:00:56 -08:00
isocialnetworkintegration.h Remove the PluginSystem 2015-11-09 18:00:56 -08:00
libdivecomputer.c Only warn about different number of tanks and gases if there are tanks 2015-12-06 09:40:21 -08:00
libdivecomputer.h libdivecomputer.h: fix warning with DC_VERSION on Win32 2015-11-18 19:24:21 -08:00
linux.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
liquivision.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
load-git.c Cloud storage: check the top commit without loading dives 2015-12-27 10:06:33 -08:00
macos.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
membuffer.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
membuffer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
metrics.cpp Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
metrics.h Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
ostctools.c simple spelling changes 2015-11-15 12:10:37 -08:00
parse-xml.c Merge branch 'cmakeAndPreferences' 2015-11-02 19:54:34 -08:00
planner.c Only close html tags if they were opened before 2015-11-24 09:20:40 -08:00
planner.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
pluginmanager.cpp Make it possible to connect to facebook again 2015-11-08 09:44:40 -08:00
pluginmanager.h Remove empty implementations 2015-11-09 18:00:56 -08:00
pref.h Add option to not check the remote when loading from git storage 2015-12-27 10:06:33 -08:00
prefs-macros.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
profile.c profile.c: remove unused variables 2015-11-07 22:26:33 -08:00
profile.h profile.h: fix incomplete type 2015-11-06 09:59:00 -08:00
qt-gui.h Missing half of the previous commit 2015-11-14 10:43:37 -08:00
qt-init.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
qthelper.cpp Try harder to find the language name that includes country code 2016-01-05 23:41:30 -08:00
qthelper.h Dive list model: add GPS string access 2015-12-26 13:33:10 -08:00
qthelperfromc.h Remove the non-canonical Subusrface version 2015-12-20 07:59:50 -08:00
qtserialbluetooth.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-git.c Remove the non-canonical Subusrface version 2015-12-20 07:59:50 -08:00
save-html.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-html.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-xml.c Interpret - as STDOUT on writing xml files 2015-11-24 09:20:03 -08:00
serial_ftdi.c ftdi: fix memory leak on error 2015-12-27 21:31:13 -08:00
sha1.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
sha1.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
statistics.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
statistics.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
strndup.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
strtod.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacestartup.c subsurfacestartup.c: leave free_prefs() empty 2015-11-15 10:29:36 -08:00
subsurfacestartup.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacesysinfo.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacesysinfo.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
taxonomy.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
taxonomy.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
time.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
uemis-downloader.c Uemis downloader: handle yet another corner case 2015-12-06 13:38:38 -08:00
uemis.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
uemis.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
units.h Fix M_PI with -std=c++11 on Mingw 2015-11-03 07:19:05 -08:00
version.c Remove the non-canonical Subusrface version 2015-12-20 07:59:50 -08:00
version.h Remove the non-canonical Subusrface version 2015-12-20 07:59:50 -08:00
webservice.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
windows.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
windowtitleupdate.cpp Don't crash if we have no WindowTitleUpdater registered 2015-11-07 09:53:17 -08:00
windowtitleupdate.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-options.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-save.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-save.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00