Turns out you have to actually commit a change before merging if you want it to be included.

This commit is contained in:
rog committed 2012-11-26 18:17:07 -05:00
1 parent 15f49c9b61
commit c0bb7aa8f3
1 file changed
+1 -2
@@ -21,8 +21,7 @@
#include <queue> #include <queue>
#include "../HW/Memmap.h" #include "../HW/Memmap.h"
class PointerWrap; #include "Chunkfile.h"
#define FS_SUCCESS (u32)0 // Success #define FS_SUCCESS (u32)0 // Success
#define FS_EACCES (u32)-1 // Permission denied #define FS_EACCES (u32)-1 // Permission denied