joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Jonathan Campbell 2018-05-03 18:54:09 -07:00
parent 8f97fe52db
commit 8b2867156d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/build_timestamp.h
View File

@ -1,3 +1,3 @@
/*auto-generated*/
#define UPDATED_STR "May 3, 2018 6:49:33pm"
#define UPDATED_STR "May 3, 2018 6:53:44pm"
#define COPYRIGHT_END_YEAR "2018"

6
merge-dev-to-master.sh
View File

@ -6,8 +6,14 @@ git checkout develop
git pull
git push
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout master
git pull
git push
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j