[xtide/f16] (19 commits) ...resolve merge conflict

[Mamoru Tasaka]

Summary of changes:

  8c4b105... Update to 2.12 dev 20110731 (*)
  f03cf3a... F-17: rebuild against new gpsd (*)
  1cd5f43... Update to 2.12 dev 20110827 (*)
  c0ff236... Update to 2.12 RC1 Kill gpsd support on <= F-16, xtide now  (*)
  659a0ff... Reupload unexpectedly deleted file... (*)
  ee90d69... Update to 2.12 (*)
  bf3518c... fix release number (*)
  0cf384b... reupload missing source (*)
  9f1bec2... Update to 2.12.1 (*)
  b9f34d4... Update harmonics data to 20111230 (*)
  986ca2e... F-17: rebuild against gcc47 (*)
  34b50c8... Update harmonics data to 20120302 (*)
  a1a8fba... Update harmonics data to 20120302 (*)
  4f1e344... 2.13 rc2 (*)
  f01e491... 2.13 rc3 (*)
  55b1b49... upload harmonics data again (*)
  a7a03fa... 2.13 (*)
  3666664... F-18: Mass rebuild (*)
  b5d610d... resolve merge conflict

(*) This commit already existed in another branch; no separate mail sent