]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
projects / config-20-100.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff73a3e 6243d89)
Merge branch 'master' into perso : VCS par variable
authorVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 23:54:07 +0000 (01:54 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 23:54:07 +0000 (01:54 +0200)
Conflicts:
.bashrc

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

diff --cc .bashrc
Simple merge
Branche perso de configuration de 20-100.