Branch :
- branch -
master
v1.18
- tag -
Release-0-25
Release-0-26
Release-0-27
Release-0-28
Release-0-29
Release-0-30
Release-0-31
Release-0-32
Release-0-33
Release-1-0
Release-1-10
Release-1-1a
Release-1-1b
Release-1-1c
Release-1-1d
Release-1-1e
Release-1-1f
Release-1-1g
Release-1-1h
Release-1-1i
Release-1-1k
Release-1-1l
Release-1-1m
Release-1-1o
Release-1-1p
Release-1-2
Release-1-2b
Release-1-2c
Release-1-2d
Release-1-2e
Release-1-2g
Release-1-2h
Release-1-3
Release-1-3b
Release-1-3d
Release-1-4
Release-1-4b
Release-1-4d
Release-1-4f
Release-1-4h
Release-1-4j
Release-1-5b
Release-1-5d
Release-1-6
Release-1-6-1b
Release-1-6b
Release-1-6d
Release-1-6f
Release-1-7
Release-1-7-2b
Release-1-7-3b
Release-1-7b
Release-1-7d
Release-1-7f
Release-1-7h
Release-1-8
Release-1-8b
Release-1-8d
Release-1-9
Release-1-9b
branchpoint-1-10
branchpoint-1-5
branchpoint-1-6
branchpoint-1-7
branchpoint-1-8
branchpoint-1-9
branchpoint-real-1-5
handle-languages
last-merge-into-user-dep-gen-branch
merging-into-user-dep-gen
ng-0.5a
pre-depend-change
pre-ian-conditionals
user-dep-gen-branchpoint
v1.10b
v1.11
v1.11b
v1.11d
v1.12
v1.12.0b
v1.12.1
v1.12.2
v1.12.3
v1.12.4
v1.12.5
v1.12.6
v1.12b
v1.13
v1.13.1
v1.13.1b
v1.13.1d
v1.13.2
v1.13.2b
v1.13.3
v1.13.4
v1.13b
v1.14
v1.14.1
v1.15
v1.15.1
v1.16
v1.16.1
v1.16.2
v1.16.3
v1.16.4
v1.16.5
v1.16.90
v1.16.92
v1.16i
v1.17
v1.17.90
v1.17.92
v1.18.1
Show log
Commit
Author :
Stefano Lattarini
Date :
2012-02-14 13:25:35
Hash :
06684c51
Message :
gitattributes: custom merge driver for ChangeLog not needed anymore
* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore. Update accordingly.