Merge branch 'master' of ssh://git.code.sf.net/p/tuxpaint/tuxpaint

This commit is contained in:
Bill Kendrick 2021-03-27 00:45:19 -07:00
commit 2587ae0ce5

View file

@ -7949,6 +7949,9 @@ static void load_stamps(SDL_Surface * screen)
load_stamp_dir(screen, "Resources/stamps");
load_stamp_dir(screen, "/Library/Application Support/TuxPaint/stamps");
#endif
#ifdef __IOS__
load_stamp_dir(screen, "stamps");
#endif
#ifdef WIN32
free(homedirdir);
homedirdir = get_fname("data/stamps", DIR_DATA);