Commit Graph
2691 Commits
Author SHA1 Message Date
Tim G. Foley 30dd3cd41d Cleaned up comments 2014-01-20 20:00:39 -05:00
Tim G. Foley ff876880d5 Cleaned up comments 2014-01-20 20:00:11 -05:00
Tim G. Foley 1b46c80613 Cleaned up comments 2014-01-20 19:59:30 -05:00
Tim G. Foley 4dc9194a36 Cleaned up comments 2014-01-20 19:58:59 -05:00
Tim G. Foley 28fad3a306 Cleaned up comments 2014-01-20 19:58:18 -05:00
Tim G. Foley 753c5e3119 Remove accidental file 2014-01-16 21:54:21 -05:00
Tim G. Foley 8b739815e3 Update README.txt 2014-01-16 21:08:27 -05:00
Tim G. Foley 3b570db6ba Merge branch 'next' of https://github.com/TimGFoley/opentx into next 2014-01-16 18:07:39 -08:00
Tim G. Foley acd974403b Fixed cross initialization error 2014-01-16 18:06:34 -08:00
Tim G. Foley 9244350737 Update README.txt 2014-01-16 20:50:57 -05:00
Tim G. Foley 508a3edf8d Merge branch 'next' of https://github.com/TimGFoley/opentx into next 2014-01-16 17:49:20 -08:00
Tim G. Foley 1589f33443 Update README.txt 2014-01-16 20:49:00 -05:00
Tim G. Foley 6158f80c06 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:48:12 -05:00
Tim G. Foley f48ed4b0d5 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:47:52 -05:00
Tim G. Foley 2398f5d59c Added Spur and Pinion Gear Strings (English) 2014-01-16 20:47:06 -05:00
Tim G. Foley 9f4fe67508 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:46:20 -05:00
Tim G. Foley 4d3747e5b6 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:45:59 -05:00
Tim G. Foley 933e2c4001 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:45:29 -05:00
Tim G. Foley ea4abdf9bf Added Spur and Pinion Gear Strings (English) 2014-01-16 20:44:49 -05:00
Tim G. Foley 93ba07eaf6 Merge branch 'next' of https://github.com/TimGFoley/opentx into next 2014-01-16 17:41:02 -08:00
Tim G. Foley 600dc5e9f4 Merge branch 'master' of https://github.com/TimGFoley/opentx into next 2014-01-16 17:35:57 -08:00
Tim G. Foley f49d281330 Added Spur and Pinion Gear Strings (English) 2014-01-16 20:31:02 -05:00
Tim G. Foley ce6e9aefc9 Delete en.h~ 2014-01-16 20:28:49 -05:00
Tim G. Foley 57ea7937d8 Delete simu.cpp~ 2014-01-16 20:27:54 -05:00
Tim G. Foley 8cdfe1040d Delete myeeprom.h~ 2014-01-16 20:27:45 -05:00
Tim G. Foley dda6069fef Delete translations.h~ 2014-01-16 20:27:36 -05:00
Tim G. Foley 5219d9d53b Delete translations.cpp~ 2014-01-16 20:27:27 -05:00
Tim G. Foley ccc4096106 Update README.txt 2014-01-16 20:25:50 -05:00
Tim G. Foley 2ea96f15d2 Merge branch 'next' of https://github.com/TimGFoley/opentx into next 2014-01-16 17:13:01 -08:00
Tim G. Foley 01c2413a0c Added RPM calculation based on Spur and Pinion Gear 2014-01-16 17:10:04 -08:00
Tim G. Foley 1edd98f501 Update README.txt 2014-01-16 19:42:48 -05:00
Bertrand Songis ddd8d137fc Replace SVN strings by a VERS string (2.0) 2014-01-16 22:31:03 +01:00
Bertrand Songis bf54445c94 Merge remote-tracking branch 'origin/kilrah/Taranis_120MHz' into next 2014-01-16 13:05:21 +01:00
Bertrand Songis 1574df9e12 Update DONATIONS.txt 2014-01-16 12:32:51 +01:00
Bertrand Songis c27c4f2c78 Update DONATIONS.txt 2014-01-16 07:07:37 +01:00
Andre Bernet 006eee1411 Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next
Conflicts:
	companion/src/main.cpp
2014-01-15 23:02:21 +01:00
Dvogonen 4f087a216f Fixes #511 - Again :-) 2014-01-15 22:24:31 +01:00
Andre Bernet cfec9ed00e Merge pull request #535 from opentx/dvogonen/Rename_companion9x_qrc_to_companion_qrc_512
Fixes #512
2014-01-15 12:59:15 -08:00
Dvogonen 9fd20a87fe Fixes #511 2014-01-15 21:54:43 +01:00
Dvogonen 20ddf27fff Merge branch 'origin/next' 2014-01-15 21:30:05 +01:00
Dvogonen 2f67344b81 Fixes #512 2014-01-15 21:13:57 +01:00
Bertrand Songis e7dc6644c7 Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
2014-01-15 16:09:17 +01:00
Andre Bernet 02f75dedd9 Merge branch 'bsongis/Companion_ModelEdit_split' into next 2014-01-15 14:55:15 +01:00
Andre Bernet 9b6c0e4fd1 Multiplex was collated to source 2014-01-15 14:41:54 +01:00
Bertrand Songis 691b52572f Fixes in ExpoDialog. Some more code refactoring 2014-01-15 14:05:33 +01:00
Bertrand Songis 888895b60b Corrections on Curves in MixerDialog and ExpoDialog (introduction of
CurveGroup to share code)
2014-01-15 11:50:00 +01:00
Bertrand Songis 0f0db5e1d3 Companion core in simu now understood: the stickMode was completely out,
and the Tx trims were shifted!
2014-01-14 22:44:10 +01:00
Bertrand Songis d945052c82 Removes the core in companion simu, compiled on VC++. A compiler bug? I
don't get it...
2014-01-14 20:06:01 +01:00
Bertrand Songis bea06a1772 Update DONATIONS.txt 2014-01-14 07:13:15 +01:00
Bertrand Songis cedddfe8d2 EEPROM 'next' support. A lot of corrections. 2014-01-13 19:09:05 +01:00