rob@odyssey:~/code/pioneer$ git branch
  3dgalaxy-textured
  add-remove-equip-fixes
  async-system-cache
  city-tags
  disable-collision-mesh
  dmalloc
  fancy-system-info
  font-use-stbtt
  game-end-on-destroy
  geospherestyle-refactor
  gui-clickable
  gui-cpanel-isolation
  gui-mixins
  gui-modular
  gui-restructure
  gui-sigevents
  gui-table-layout
  guichan
  guitest
  lua-constants
  lua-overhaul
  lua-planet-names
* master
  new-laser-smoke-textures
  new-lua-custom-systems
  planet-mass-fix
  rocket-ui
  sectorview-infobox-visible-fix
  separate-system-cache
  thread-manager
  view-manager
  wait-for-terrain-thread