Differences between revisions 1 and 6 (spanning 5 versions)

Welcome to the the SPACES project Web site !

$/!\$ Edit conflict - other version:

This franco-japonese project is financed by ANR for the french side:

And by JST for the japonese side:

-  ⇤ ← Revision 1 as of 2011-04-13 15:05:24 → 
  Size: 369
  Editor: celinux222
  Comment:
+   ← Revision 6 as of 2011-04-13 18:14:52 → ⇥
  Size: 368
  Editor: bny92-5-82-232-56-37
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 2:
-= projet SEFPGA (Secured Embedded FPGA) =
Bienvenue sur le site WEB du projet SeFPGA !
+= Welcome to the the SPACES project Web site ! =
-Line 5:
+Line 4:
-'''SOMMAIRE'''
+---- /!\ '''Edit conflict - other version:''' ----
This franco-japonese project is financed by ANR for the french side:
{{attachment:logo_ANR.gif||height="104px",width="239px"}}
-Line 7:
+Line 8:
- * [[Presentation]]

 * [[Partenaires]]

= Travaux =
 * [[Réunions]]
 * [[documentation|Documents de travail]]
 * [[Livrables]]
 * [[Publications]]

= Documentation =
 * [[Doc|Documentation]]

 * [[Liens]]
+And by JST for the japonese side:
{{attachment:logo_JST.gif||height="104px",width="239px"}}

Diff for "spaces"