Merge branch 'master' into jgrpp
# Conflicts: # src/console_gui.cpp # src/lang/korean.txt # src/video/sdl2_v.cpp # src/video/sdl2_v.h # src/window.cpp # src/window_gui.h
This commit is contained in:
2
src/3rdparty/md5/md5.cpp
vendored
2
src/3rdparty/md5/md5.cpp
vendored
@@ -1,5 +1,3 @@
|
||||
/* $Id$ */
|
||||
|
||||
/** @file md5.cpp Creating MD5 checksums of files. */
|
||||
|
||||
/*
|
||||
|
2
src/3rdparty/md5/md5.h
vendored
2
src/3rdparty/md5/md5.h
vendored
@@ -1,5 +1,3 @@
|
||||
/* $Id$ */
|
||||
|
||||
/** @file md5.h Functions to create MD5 checksums. */
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user