]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0917436 f12382c)
Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Sep 2011 18:46:39 +0000 (11:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Sep 2011 18:46:39 +0000 (11:46 -0700)
commit550eb862fa6dbc1d07c6a3165634900421dd2ca6
treeeca4668dfe8c8fe18a4ecd3128392789cd0ca432tree | snapshot
parent09174367294c399265954a9e2770427e5ee251bacommit | diff
parentf12382c66f2b3deddf38f7d51fda3a2c75a0c5facommit | diff
Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog

* 'compiler-warning' of https://github.com/nathansamson/diveclog:
  Removed the unused startemp and enttemp calculations. This fixes a compiler warning too.

Fix up trivial conflict in dive.c due to the temperature simplification
(commit 9961c7f89ce6: "Remove redundant temperature readings").
dive.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)