Merge branch 'master' of git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 01:05:10 +0000 (18:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 01:05:10 +0000 (18:05 -0700)
commit257000c617cfdc99fb2916b81268a7e971c12ca6
treefa337dd10424393c73e803d0563e2c578f8fe4fb
parent047057bb4159533b3323003f89160588c9e61fbd
parent22a713c72df8b6799c59287c50cee44c4a6db51e
Merge branch 'master' of git://ozlabs.org/~paulus/gitk

* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Follow themed bgcolor in help dialogs
  gitk: fr.po: Sync translations with git
  gitk: Update French translation (311t)
  gitk: Update German translation
  gitk: Update Bulgarian translation (311t)
gitk-git/gitk
gitk-git/po/bg.po
gitk-git/po/de.po
gitk-git/po/fr.po