]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Jan 2014 16:50:50 +0000 (08:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Jan 2014 16:50:50 +0000 (08:50 -0800)
* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Indent word-wrapped lines in commit display header
  gitk: Comply with XDG base directory specification
  gitk: Replace "next" and "prev" buttons with down and up arrows
  gitk: chmod +x po2msg.sh
  gitk: Update copyright dates
  gitk: Add Bulgarian translation (304t)
  gitk: Fix mistype

1  2 
gitk-git/gitk
gitk-git/po/bg.po
gitk-git/po/po2msg.sh

diff --cc gitk-git/gitk
Simple merge
index 0000000000000000000000000000000000000000,782397e6b5c843ba45b9e118a427ab1438bb8564..782397e6b5c843ba45b9e118a427ab1438bb8564
mode 000000,100644..100644
--- /dev/null
index c63248e3752b8b479f75ad2fe772dd40f684be54,c63248e3752b8b479f75ad2fe772dd40f684be54..c63248e3752b8b479f75ad2fe772dd40f684be54
mode 100644,100755..100755