secure.softndesign.org Git - debian6500.git/commit

author	Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
	Wed, 3 Sep 2014 12:22:03 +0000 (14:22 +0200)
committer	Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
	Wed, 3 Sep 2014 12:22:03 +0000 (14:22 +0200)
commit	b577d005586467451ebd44760170f68e941a2918
tree	99601d235b154175c509e2857216c921bbb3acb6	tree \| snapshot (tar.gz zip)
parent	33432d85686e7c6b12175043eb53771d15b17b5e	commit \| diff
parent	3c483defa0af8dbb74a2eaa569ad26c1c8d0e2cd	commit \| diff

Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correctif_evf_vau

Conflicts:
dev/common/libhrtrk/CHANGELOG.txt
dev/common/libhrtrk/src/version.c