Merge branch 'tracking-ref-label'
commit2114ebaf8c204102083cd139bf01e5a88682a988
authorSven Strickroth <email@cs-ware.de>
Sun, 6 Jan 2013 14:16:50 +0000 (6 15:16 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 6 Jan 2013 14:16:50 +0000 (6 15:16 +0100)
tree9b3866d6c41bc138d40cebbfb76e972b65743c48
parenta96afab6090da542887d766e11efdb6316b54ca7
parentccf375efc1ff9f8c167a262ccfd23b7a62070edc
Merge branch 'tracking-ref-label'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
doc/source/en/TortoiseGit/tsvn_dug/dug_settings_general.xml
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/GitLogListBase.cpp
src/TortoiseProc/GitLogListBase.h
src/TortoiseProc/resource.h