diff options
| author |  archshift | 2014-05-16 23:21:03 -0700 |
|---|---|---|
| committer | archshift | 2014-05-16 23:21:03 -0700 |
| commit | b8c8d0903ec9be4c7d580464480a0136277be803 (patch) | |
| tree | 9280a9f01e1312d0d8aed493282ae65d2384963c /src/common/log.h | |
| parent | Added FindGLEW to cmake-modules (diff) | |
| parent | Merge pull request #17 from bunnei/arm-vfp (diff) | |
| download | yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.gz yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.xz yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.zip | |
Merge remote-tracking branch 'upstream/master' into issue-7-fix
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log.h b/src/common/log.h index 02db8bd55..d95f51f56 100644 --- a/src/common/log.h +++ b/src/common/log.h | |||
| @@ -33,7 +33,7 @@ enum LOG_TYPE { | |||
| 33 | EXPANSIONINTERFACE, | 33 | EXPANSIONINTERFACE, |
| 34 | GDB_STUB, | 34 | GDB_STUB, |
| 35 | ARM11, | 35 | ARM11, |
| 36 | GPFIFO, | 36 | GSP, |
| 37 | OSHLE, | 37 | OSHLE, |
| 38 | MASTER_LOG, | 38 | MASTER_LOG, |
| 39 | MEMMAP, | 39 | MEMMAP, |
| @@ -54,7 +54,7 @@ enum LOG_TYPE { | |||
| 54 | WII_IPC_FILEIO, | 54 | WII_IPC_FILEIO, |
| 55 | WII_IPC_HID, | 55 | WII_IPC_HID, |
| 56 | WII_IPC_HLE, | 56 | WII_IPC_HLE, |
| 57 | WII_IPC_NET, | 57 | SVC, |
| 58 | NDMA, | 58 | NDMA, |
| 59 | HLE, | 59 | HLE, |
| 60 | RENDER, | 60 | RENDER, |