Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

imt2531-assignment2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

cd5f5ba1

Commit cd5f5ba1 authored Apr 16, 2018 by JonShard

Downloads
- Plain Diff

Merge branch 'dev' of prod3.imt.hig.no:overkill-studios/imt2531-assignment2 into dev

parents 75140e20 f8c92e6d

No related branches found

No related tags found

Loading

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 1 deletion

CMakeLists.txt
CMakeSettings.json 2 additions, 2 deletions

CMakeSettings.json
assets/materials/brick.yml 1 addition, 1 deletion

assets/materials/brick.yml
include/overkill/Init.hpp 3 additions, 0 deletions

include/overkill/Init.hpp
include/overkill/Watcher.hpp 31 additions, 0 deletions

include/overkill/Watcher.hpp
lib/tinyheaders/README.md 71 additions, 0 deletions

lib/tinyheaders/README.md
lib/tinyheaders/tinyfiles.h 516 additions, 0 deletions

lib/tinyheaders/tinyfiles.h
src/Init.cpp 6 additions, 0 deletions

src/Init.cpp
src/Watcher.cpp 41 additions, 0 deletions

src/Watcher.cpp
src/main.cpp 3 additions, 0 deletions

src/main.cpp

with 677 additions and 4 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