Difference between revisions of "Template:Comet spacecraft"

From blackwiki
Jump to navigation Jump to search
imported>Fotaun
Line 36: Line 36:
 
|group5 = Lander
 
|group5 = Lander
 
|list5  =  
 
|list5  =  
*  ''[[Rosetta (spacecraft)|Rosetta]]/[[Philae (spacecraft)|Philae]]''
+
*  ''[[Rosetta (spacecraft)|Rosetta]]''
 +
** ''[[Philae (spacecraft)|Philae]]''
  
 
|group6 = Impactor
 
|group6 = Impactor
Line 42: Line 43:
 
*  [[Deep Impact (spacecraft)|Deep Impact]]/[[EPOXI]]
 
*  [[Deep Impact (spacecraft)|Deep Impact]]/[[EPOXI]]
  
 +
<!--
 
|group7 = Proposed
 
|group7 = Proposed
 
|list7  =  
 
|list7  =  
* [[MarcoPolo-R]]
+
-->
 
+
|group9 = Cancelled
|group8 = Inactive plan
+
|list9 =  
|list8 =  
 
 
* [[Comet Hopper]]
 
* [[Comet Hopper]]
 
* [[Comet Rendezvous Asteroid Flyby|CRAF]]
 
* [[Comet Rendezvous Asteroid Flyby|CRAF]]
 
* [[Hayabusa Mk2]]
 
* [[Hayabusa Mk2]]
 
* [[Marco Polo (spacecraft)|Marco Polo]]
 
* [[Marco Polo (spacecraft)|Marco Polo]]
 +
* [[MarcoPolo-R]]
 
* [[Vesta (spacecraft)|Vesta]]
 
* [[Vesta (spacecraft)|Vesta]]
  

Revision as of 00:14, 25 September 2014

Template documentation[view] [edit] [history] [purge]

Template:Spaceflight navboxes