Merge git-gui 0.14.0
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Mar 2011 17:42:26 +0000 (10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Mar 2011 17:42:35 +0000 (10:42 -0700)
14 files changed:
1  2 
git-gui/git-gui.sh
git-gui/lib/browser.tcl
git-gui/lib/choose_repository.tcl
git-gui/lib/commit.tcl
git-gui/lib/diff.tcl
git-gui/lib/index.tcl
git-gui/lib/merge.tcl
git-gui/lib/mergetool.tcl
git-gui/lib/remote.tcl
git-gui/lib/remote_branch_delete.tcl
git-gui/lib/transport.tcl
git-gui/po/glossary/pt_br.po
git-gui/po/pt_br.po
git-gui/po/ru.po

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,eb039b2b49527830a44c1efe02e6e8bde2681968..eb039b2b49527830a44c1efe02e6e8bde2681968
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,b175b9791ecb83c761d360e38ff2526717ad3deb..b175b9791ecb83c761d360e38ff2526717ad3deb
mode 000000,100644..100644
--- /dev/null
Simple merge