another pull request

[Dirk Hohndel]

Two tiny changes
- check we don't override existing equipment data when editing multiple dives
- the macos.c code had gotten out of sync with gtk-gui.c (I clearly hadn't built / run subsurface on my Mac in a while)

/D

The following changes since commit d2d4364afcc3fb310ea43573f0d455f90c9212ce:

  Merge branch 'fixes' of git://git.hohndel.org/subsurface (2012-08-17 16:14:20 -0700)

are available in the git repository at:

  gitolite at git.hohndel.org:subsurface fixes

Dirk Hohndel (2):
      When editing multiple files, don't override existing equipment entries
      Minor Macos menu entry modification fix

 info.c  |    8 ++++----
 macos.c |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)