Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4836e1d 94e1e9c)
Merge tag 'LIV_TRC6500_2.3.0' into dev_tr65_ACA_198_parametres_init_statique_donnees_... dev_tr65_ACA_198_parametres_init_statique_donnees_loc_gps
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Thu, 26 Jun 2014 15:06:57 +0000 (17:06 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Thu, 26 Jun 2014 15:06:57 +0000 (17:06 +0200)
Conflicts:
dev/modele/implementation/trc6500_chaine_gon/GonExt/src/PortMsgSup2GonExt.cpp


Trivial merge
Debian distribution for TRC6500