Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 694d88d d873e9f)
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_ACA_871_chemin...
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:47:04 +0000 (14:47 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:47:04 +0000 (14:47 +0200)
Conflicts:
dev/code_metier/libPist/src/libpist.c


Trivial merge
Debian distribution for TRC6500