]> 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: 89e2ce9 8a79d46)
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:44:16 +0000 (23:44 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:44:16 +0000 (23:44 +0200)
Conflicts:
.bashrc

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

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