Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81cd0fa 50ea04f)
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva... int_tr65_nra_2.3.1
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 12:17:33 +0000 (14:17 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 14:01:35 +0000 (16:01 +0200)
impacts dependances on libmiso/libgonext/Xgon/Gonext/Monitoring
Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/src/Version.cpp
dev/modele/implementation/trc6500_chaine_sup/SupCapteur/CHANGELOG.txt

1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
Debian distribution for TRC6500