diff options
| author | Jason Maskell <[email protected]> | 2016-05-09 10:42:27 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-09 10:42:27 +0200 |
| commit | 9de25e64ce865f2f64ec0cdb6f38184f257a9db5 (patch) | |
| tree | 78132a1a9217330d9a96695e9fb741e53af941d1 | |
| parent | Initial commit with PS4 and XBone stuff trimmed. (diff) | |
| parent | Initial commit (diff) | |
| download | waveworks_archive-9de25e64ce865f2f64ec0cdb6f38184f257a9db5.tar.xz waveworks_archive-9de25e64ce865f2f64ec0cdb6f38184f257a9db5.zip | |
Merge branch 'master' of https://github.com/NVIDIAGameWorks/WaveWorks
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 28 |
1 files changed, 28 insertions, 0 deletions
@@ -12,3 +12,31 @@ intermediate/ output/ test/d3d10/win64/ test/gl2/win64/debug/cudart64_55.dll +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app |