Merge branch 'versioning' into 'master' (dd6df4cc) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

dd6df4cc

Commit dd6df4cc authored 9 years ago by Inuyasha

Downloads
- Plain Diff

Merge branch 'versioning' into 'master'

Updates to comptime.sh/comptime.bat for branch/revision info

Basically makes comptime.bat work with git, displays branch and SHA-1 hash of revision information in the menu, etc.

See merge request !23

parents a4badcfe c2f40b6b

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 1 deletion

CMakeLists.txt
comptime.bat 25 additions, 4 deletions

comptime.bat
comptime.sh 7 additions, 3 deletions

comptime.sh
src/comptime.c 2 additions, 0 deletions

src/comptime.c
src/config.h.in 1 addition, 0 deletions

src/config.h.in
src/d_netcmd.c 4 additions, 0 deletions

src/d_netcmd.c
src/doomdef.h 5 additions, 3 deletions

src/doomdef.h
src/m_menu.c 6 additions, 3 deletions

src/m_menu.c
src/m_misc.c 4 additions, 6 deletions

src/m_misc.c

with 56 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment