[Ssc-dev] [guardianproject/InformaCore] d5bb19: make sure the informaservice is activated for the ...

[n8fr8]

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/InformaCore
  Commit: d5bb191b2dfa3e3becc0beb294bc8c707ace66f6
      https://github.com/guardianproject/InformaCore/commit/d5bb191b2dfa3e3becc0beb294bc8c707ace66f6
  Author: n8fr8 <nathan at freitas.net>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IRegion.java

  Log Message:
  -----------
  make sure the informaservice is activated for the iregion tag


  Commit: 59c61ebbb5168cc33669b6440453e05373f7f048
      https://github.com/guardianproject/InformaCore/commit/59c61ebbb5168cc33669b6440453e05373f7f048
  Author: n8fr8 <nathan at freitas.net>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/informa/suckers/GeoFusedSucker.java

  Log Message:
  -----------
  if the location is not available yet, return 0 for time


  Commit: bf74d2298675cf4ca7e1fd219cc4692f5dd462ac
      https://github.com/guardianproject/InformaCore/commit/bf74d2298675cf4ca7e1fd219cc4692f5dd462ac
  Author: n8fr8 <nathan at freitas.net>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java

  Log Message:
  -----------
  trying the GeoFused sucker again


  Commit: 8295b62131f91e5b98bd563fc3ee686da122bd2d
      https://github.com/guardianproject/InformaCore/commit/8295b62131f91e5b98bd563fc3ee686da122bd2d
  Author: n8fr8 <nathan at guardianproject.info>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/informa/suckers/GeoFusedSucker.java
    M src/org/witness/informacam/models/media/IRegion.java

  Log Message:
  -----------
  Merge pull request #13 from n8fr8/bug_merge_instability

Bug merge instability


Compare: https://github.com/guardianproject/InformaCore/compare/98b737171268...8295b62131f9