From: Alexandre Cazalis (Alten) Date: Tue, 2 Sep 2014 09:47:02 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_907_az_sig... X-Git-Tag: debian_7.5_20141208~50^2 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=6aabbfeea2d8e9d3583e6a519525db639cfbfa36;p=debian6500.git Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_907_az_sigma_az_evf Conflicts: dev/common/libhrtrk/CHANGELOG.txt dev/common/libhrtrk/src/version.c --- 6aabbfeea2d8e9d3583e6a519525db639cfbfa36