Merge branch 'pu' of git://repo.or.cz/git-gui into devel
commit1c10a57c41a64de06619fe29ba166c66866c14dc
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 23 Sep 2007 13:29:04 +0000 (23 14:29 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 23 Sep 2007 13:29:34 +0000 (23 14:29 +0100)
tree1c7b097ad9c8a1810da259ff3dc080d2b6622a5a
parent74c2a08ef9ec16ce4cb3daef0b65fad439448538
parentfbc8a93cd5b03bf15a3ebef6c0a512d2da3df7c4
Merge branch 'pu' of git://repo.or.cz/git-gui into devel

Conflicts:

Makefile

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
41 files changed:
git-gui/Makefile
git-gui/README
git-gui/git-gui.pot
git-gui/git-gui.sh
git-gui/glossary/Makefile
git-gui/glossary/de.po
git-gui/glossary/git-gui-glossary.pot
git-gui/glossary/git-gui-glossary.txt
git-gui/glossary/txt-to-pot.sh
git-gui/glossary/zh_cn.po
git-gui/lib/blame.tcl
git-gui/lib/branch_checkout.tcl
git-gui/lib/branch_create.tcl
git-gui/lib/branch_delete.tcl
git-gui/lib/branch_rename.tcl
git-gui/lib/browser.tcl
git-gui/lib/checkout_op.tcl
git-gui/lib/choose_font.tcl
git-gui/lib/choose_repository.tcl
git-gui/lib/choose_rev.tcl
git-gui/lib/commit.tcl
git-gui/lib/console.tcl
git-gui/lib/database.tcl
git-gui/lib/date.tcl
git-gui/lib/diff.tcl
git-gui/lib/error.tcl
git-gui/lib/index.tcl
git-gui/lib/merge.tcl
git-gui/lib/option.tcl
git-gui/lib/remote.tcl
git-gui/lib/remote_branch_delete.tcl
git-gui/lib/shortcut.tcl
git-gui/lib/status_bar.tcl
git-gui/lib/transport.tcl
git-gui/po/.gitignore
git-gui/po/de.po
git-gui/po/hu.po
git-gui/po/it.po
git-gui/po/ja.po
git-gui/po/ru.po
git-gui/po/zh_cn.po