git.osdn.net Git - winmerge-jp/winmerge-jp.git/commit

(root) / winmerge-jp / winmerge-jp.git / commit

author	sdottaka <none@none>
	Tue, 12 Feb 2013 02:49:12 +0000 (18:49 -0800)
committer	sdottaka <none@none>
	Tue, 12 Feb 2013 02:49:12 +0000 (18:49 -0800)
commit	0c9a00c3b0fd7965647ba14f18dca2652cfc60bd
tree	f5473d0b6bbe348dcf96ed8c6387d6e70f21b1a4	tree \| snapshot
parent	a630426d599fc65dfc24a49905fdf5abd766c926	commit \| diff

Merge from SVN trunk

87 files changed:

ArchiveSupport/Merge7z/Merge7zCommon.cpp		diff \| blob \| history
Docs/Users/ChangeLog.txt		diff \| blob \| history
Docs/Users/Manual/Configuration.xml		diff \| blob \| history
Docs/Users/Manual/Faq.xml		diff \| blob \| history
Docs/Users/Manual/Filters.xml		diff \| blob \| history
Docs/Users/Manual/Install.xml		diff \| blob \| history
Docs/Users/Manual/Introduction.xml		diff \| blob \| history
Docs/Users/Manual/Locales.xml		diff \| blob \| history
Docs/Users/Manual/Plugins.xml		diff \| blob \| history
Docs/Users/Manual/Version_control.xml		diff \| blob \| history
Docs/Users/Manual/WinMerge_help.xml		diff \| blob \| history
Docs/Users/Manual/replaceables.xml		diff \| blob \| history
Docs/Users/Manual/screenshots/tfs_configure.png	[new file with mode: 0644]	blob
Docs/Users/Manual_ja/Configuration.xml		diff \| blob \| history
Docs/Users/Manual_ja/Faq.xml		diff \| blob \| history
Docs/Users/Manual_ja/Filters.xml		diff \| blob \| history
Docs/Users/Manual_ja/Install.xml		diff \| blob \| history
Docs/Users/Manual_ja/Introduction.xml		diff \| blob \| history
Docs/Users/Manual_ja/Locales.xml		diff \| blob \| history
Docs/Users/Manual_ja/Plugins.xml		diff \| blob \| history
Docs/Users/Manual_ja/Text_encoding.xml	[deleted file]	blob \| history
Docs/Users/Manual_ja/Version_control.xml		diff \| blob \| history
Docs/Users/Manual_ja/Whatsnew.xml	[deleted file]	blob \| history
Docs/Users/Manual_ja/WinMerge_help.xml		diff \| blob \| history
Docs/Users/Manual_ja/screenshots/tfs_configure.png	[new file with mode: 0644]	blob
Docs/Users/ReleaseNotes.html		diff \| blob \| history
Installer/InnoSetup/WinMerge.iss		diff \| blob \| history
Installer/InnoSetup/WinMergeX64.iss		diff \| blob \| history
Installer/Runtimes/MFC71JPN.DLL	[deleted file]	blob \| history
Installer/Runtimes/mfc71.dll	[deleted file]	blob \| history
Installer/Runtimes/mfc71u.dll	[deleted file]	blob \| history
Installer/Runtimes/msvcp71.dll	[deleted file]	blob \| history
Installer/Runtimes/msvcr71.dll	[deleted file]	blob \| history
ShellExtension/ShellExtension.rc		diff \| blob \| history
ShellExtension/WinMergeShell.cpp		diff \| blob \| history
Translations/Docs/Readme/ReadMe-Basque.txt		diff \| blob \| history
Translations/InnoSetup/Basque.isl		diff \| blob \| history
Translations/InnoSetup/Brazilian_Portuguese.isl		diff \| blob \| history
Translations/InnoSetup/Bulgarian.isl		diff \| blob \| history
Translations/InnoSetup/Catalan.isl		diff \| blob \| history
Translations/InnoSetup/Chinese_Simplified.isl		diff \| blob \| history
Translations/InnoSetup/Chinese_Traditional.isl		diff \| blob \| history
Translations/InnoSetup/Croatian.isl		diff \| blob \| history
Translations/InnoSetup/Czech.isl		diff \| blob \| history
Translations/InnoSetup/Danish.isl		diff \| blob \| history
Translations/InnoSetup/Dutch.isl		diff \| blob \| history
Translations/InnoSetup/English.isl		diff \| blob \| history
Translations/InnoSetup/French.isl		diff \| blob \| history
Translations/InnoSetup/Galician.isl		diff \| blob \| history
Translations/InnoSetup/German.isl		diff \| blob \| history
Translations/InnoSetup/Greek.isl		diff \| blob \| history
Translations/InnoSetup/Hungarian.isl		diff \| blob \| history
Translations/InnoSetup/Italian.isl		diff \| blob \| history
Translations/InnoSetup/Japanese.isl		diff \| blob \| history
Translations/InnoSetup/Korean.isl		diff \| blob \| history
Translations/InnoSetup/Norwegian.isl		diff \| blob \| history
Translations/InnoSetup/Polish.isl		diff \| blob \| history
Translations/InnoSetup/Portuguese.isl		diff \| blob \| history
Translations/InnoSetup/Romanian.isl		diff \| blob \| history
Translations/InnoSetup/Russian.isl		diff \| blob \| history
Translations/InnoSetup/Serbian.isl		diff \| blob \| history
Translations/InnoSetup/Slovak.isl		diff \| blob \| history
Translations/InnoSetup/Slovenian.isl		diff \| blob \| history
Translations/InnoSetup/Spanish.isl		diff \| blob \| history
Translations/InnoSetup/Swedish.isl		diff \| blob \| history
Translations/InnoSetup/Turkish.isl		diff \| blob \| history
Translations/InnoSetup/Ukrainian.isl		diff \| blob \| history
Translations/WinMerge/Basque.po		diff \| blob \| history
Translations/WinMerge/Croatian.po		diff \| blob \| history
Translations/WinMerge/Czech.po		diff \| blob \| history
Translations/WinMerge/Dutch.po		diff \| blob \| history
Translations/WinMerge/English.pot		diff \| blob \| history
Translations/WinMerge/Galician.po		diff \| blob \| history
Translations/WinMerge/German.po		diff \| blob \| history
Translations/WinMerge/Greek.po		diff \| blob \| history
Translations/WinMerge/Hungarian.po		diff \| blob \| history
Translations/WinMerge/Italian.po		diff \| blob \| history
Translations/WinMerge/Korean.po		diff \| blob \| history
Translations/WinMerge/Persian.po		diff \| blob \| history
Translations/WinMerge/Polish.po		diff \| blob \| history
Translations/WinMerge/Portuguese.po		diff \| blob \| history
Translations/WinMerge/Romanian.po		diff \| blob \| history
Translations/WinMerge/Serbian.po		diff \| blob \| history
Translations/WinMerge/Slovak.po		diff \| blob \| history
Translations/WinMerge/Slovenian.po		diff \| blob \| history
Translations/WinMerge/Swedish.po		diff \| blob \| history
Translations/WinMerge/Ukrainian.po		diff \| blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help