| changeset 118 | 2c8d73b46563 |
| parent 98 | bb1d25d50d73 |
| 117:6d49b8f66b9c | 118:2c8d73b46563 |
|---|---|
7 // Un commentaire |
7 // Un commentaire |
8 int main(int argc, char **argv) |
8 int main(int argc, char **argv) |
9 { |
9 { |
10 printf("once more, hello.\n"); |
10 printf("once more, hello.\n"); |
11 printf("hello merged ?"); |
11 printf("hello merged ?"); |
12 printf("This is not right"); |
|
12 return 0; |
13 return 0; |
13 } |
14 } |