Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33432d8 3c483de)
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correc... dev_tr65_aca_913_correctif_evf_vau
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 3 Sep 2014 12:22:03 +0000 (14:22 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 3 Sep 2014 12:22:03 +0000 (14:22 +0200)
Conflicts:
dev/common/libhrtrk/CHANGELOG.txt
dev/common/libhrtrk/src/version.c


Trivial merge
Debian distribution for TRC6500