4 Commits

Author	SHA1	Message	Date
GinjaNinja32	f4435503cc	Linux versions of PsiOmegaDelta's git_merge_installer scripts	2015-02-04 10:12:11 +00:00
PsiOmega	0673c9179b	Git Merge Installers ... There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.	2015-02-03 22:02:50 +01:00
Mloc-Argent	6db1484a80	tools: update MapPatcher.jar, add mapclean helper ... MapPatcher.jar can now take a user-defined tile line when conflicted. Added a clean_map_git.sh file that will automatically clean maps without needing a prepare_map.bat call beforehand. Needs to be run in git bash, or have .sh associated with something that has git. Fixed line endings in install.txt to show up right in notepad. Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2014-05-15 22:00:24 +01:00
Erthilo	d0c71c8dc2	Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.	2013-08-31 19:10:02 +01:00