search

DarthMike / indielib-crossplatform

IndieLib is a cross-platform Game Graphics engine. Main focus is OpenGL ES 2.0 for mobile iOS operating system, and OpenGL desktop. **NOT SUPPORTED ANYMORE**
zlib License
61 stars 27 forks source link

Merge MarkZ3 to Omnialabs #137

Closed samus535 closed 11 years ago

DarthMike commented 11 years ago

Thanks!

samus535 commented 11 years ago

Hi, How can I do it. (I'm not fully familiar with pull request)

Thank you very much and have a nice day

On Sun, Aug 4, 2013 at 1:05 PM, Miguel Angel Quinones Garcia < notifications@github.com> wrote:

Hi thanks for contributing!

Just a small thing, could you remove these two commits: e5a0d67https://github.com/DarthMike/indielib-crossplatform/commit/e5a0d67 7f22ac9https://github.com/DarthMike/indielib-crossplatform/commit/7f22ac9

They relate to adding a Game folder in repo, which we don't necessarily want in indielib repo.

— Reply to this email directly or view it on GitHubhttps://github.com/DarthMike/indielib-crossplatform/pull/137#issuecomment-22074966 .

Simon

DarthMike commented 11 years ago

Hi no need to remove commits from pull request. I accepted it as-is, it doesn't hurt having Game in repo root. We may remove it later on because we would need to provide projects not only for win but OSX, Linux (makefiles), and iOS. All is merged now.

M-F-K commented 11 years ago

Cool, - thanks samus535. DarthMike - I agree on your view regarding the 'Game' setup.

DarthMike commented 11 years ago

Removed 'Game' in indielib repo. All other things stay thanks!