 Andre Bernet
|
6d0398ec64
|
Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
radio/src/translations/es.h
radio/src/translations/es.h.txt
radio/src/translations/fr.h
radio/src/translations/fr.h.txt
|
2013-12-14 13:03:25 +01:00 |
|
|
Bertrand Songis
|
39a4b8e39d
|
Merge branch 'bsongis/Companion9x_merge' into next
|
2013-12-10 22:21:38 +01:00 |
|
|
Andre Bernet
|
d125e408f2
|
FAS offset now an option for M64 only
|
2013-12-03 22:29:22 +01:00 |
|
|
Andre Bernet
|
413119efc5
|
French translation
|
2013-12-03 15:47:25 +01:00 |
|
|
Bertrand Songis
|
b2db04f4bb
|
Visual C++ compilation
|
2013-12-02 21:13:42 +01:00 |
|
|
Bertrand SongisandAndre Bernet
|
772d1ca4c8
|
Directory transmitter renamed to radio
|
2013-12-02 12:11:38 +01:00 |
|
|
Bertrand Songis
|
942e658c8e
|
Directory transmitter renamed to radio
|
2013-12-02 07:13:57 +01:00 |
|