02/07/15

Dependencies:   mbed

Dependents:   TabbedGUIMbed

Committer:
aidanPJG
Date:
Tue Jul 07 12:56:24 2015 +0000
Revision:
24:92600b1d15b1
Parent:
23:6c2416d81825
Parent:
20:0b2279011691
Child:
25:bab86a12e9ad
proper merge this time;

Who changed what in which revision?

UserRevisionLine numberNew contents of line
ADAMSTRUTT 17:d9fb4a3780c7 1 #include "mbed.h"
ADAMSTRUTT 17:d9fb4a3780c7 2 #include "Calculate.h"
ADAMSTRUTT 17:d9fb4a3780c7 3 #include "Distance.h"
ADAMSTRUTT 20:0b2279011691 4 //#include "Counter.h
ADAMSTRUTT 17:d9fb4a3780c7 5
ADAMSTRUTT 20:0b2279011691 6 int main(void)
aidanPJG 7:d6f78ba7c5f7 7 {
aidanPJG 24:92600b1d15b1 8
ADAMSTRUTT 20:0b2279011691 9 calculate();
aidanPJG 24:92600b1d15b1 10
ADAMSTRUTT 17:d9fb4a3780c7 11 }