diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-21 20:40:32 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-21 20:40:32 +0100 |
| commit | ca1fd44637ad5ce9ec287ff71addd38e98f66f4f (patch) | |
| tree | 3642ff488dd144b014131de48bf926c6e3d1043c /java | |
| parent | 576e979df4a54df9bf5ffeae3559f488b3045268 (diff) | |
| parent | 50d1f62bf4a8d70466100463238228bc8305a5c7 (diff) | |
| download | MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.gz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.lz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.xz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.zip | |
Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
main.cpp
Diffstat (limited to 'java')
| -rw-r--r-- | java/javaendian.h (renamed from java/endian.h) | 0 | ||||
| -rw-r--r-- | java/membuffer.h | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/java/endian.h b/java/javaendian.h index fa6207fe..fa6207fe 100644 --- a/java/endian.h +++ b/java/javaendian.h diff --git a/java/membuffer.h b/java/membuffer.h index 48304b9f..2ea3a69b 100644 --- a/java/membuffer.h +++ b/java/membuffer.h @@ -3,7 +3,7 @@ #include <string> #include <vector> #include <exception> -#include "endian.h" +#include "javaendian.h" namespace util { |