Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

summary refs log tree commit diff stats

path: root/src/3rdparty/webkit/.gitattributes

blob: 5b43bd02a0185a1025aa98177909e1dc5d7beae0 (plain)

# To enable automatic merging of ChangeLog files, use the following command:
# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
ChangeLog* merge=changelog