Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 0 insertions, 26 deletions

diff --git a/music/pokeredmusicdisasm/File.h b/music/pokeredmusicdisasm/File.h
deleted file mode 100644
index de1e6998..00000000
--- a/music/pokeredmusicdisasm/File.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef FILE_H

-#define FILE_H

-

-#include <string>

-#include <vector>

-#include <fstream>

-

-class File

-{

-public:

-	File();

-	File(std::string filename, unsigned int offset = 0, unsigned int length = 0);

-

-	string GetFileName();

-	void SetFilename(string value);

-

-private:

-	std::string filename;

-	std::vector<unsigned char> fileBuffer;

-	std::fstream fileHandle;

-

-	std::vector<unsigned char>::iterator start;

-	std::vector<unsigned char>::iterator cur;

-};

-

-#endif
\ No newline at end of file