Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e27fbc e3b9448)
Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 16 Jun 2016 13:31:55 +0000 (15:31 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 16 Jun 2016 13:31:55 +0000 (15:31 +0200)
Conflicts:
master/root/bin/colorlog

1  2 
master/root/bin/colorlog patch | diff1 | diff2 | blob | history

diff --cc master/root/bin/colorlog
index c261b7d73e77147ea4e2a3905c750ec65ac982c9,7e0ae004676bfc55f23700a6c92afac5dcd6d7a5..7e0ae004676bfc55f23700a6c92afac5dcd6d7a5
mode 100755,100644..100755
--- 1/master/root/bin/colorlog
--- 2/master/root/bin/colorlog
+++ b/master/root/bin/colorlog
Debian distribution for TRC6500