| author | Luke Yeager <luke.yeager@gmail.com> | |
| Tue, 26 May 2015 20:29:10 +0000 (13:29 -0700) | ||
| committer | Luke Yeager <luke.yeager@gmail.com> | |
| Tue, 26 May 2015 20:29:10 +0000 (13:29 -0700) | ||
| commit | 8f6396461426572ed835ffb3bddcd0c1b32859ad | |
| tree | fc38276036a07d9f322e6681895edbdb8864fa5f | tree | snapshot (tar.xz tar.gz zip) |
| parent | d128173c7b309a5a4a08dec51725ad762030145f | commit | diff |
| parent | 13aee7fb76219ca398dd3d8571dc3073dded9e5c | commit | diff |
Merge remote-tracking branch 'cypof/multi_gpu' into multi-gpu
Conflicts:
Makefile.config.example
Conflicts:
Makefile.config.example
| Makefile | diff1 | | diff2 | | blob | history |
| Makefile.config.example | diff1 | | diff2 | | blob | history |