admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Daniel Bovensiepen
2012-11-08 17:36:39 +09:00
parent e1e369470e
commit fcaeec554a
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile
-8
View File
@@ -51,13 +51,6 @@ endif
# mruby compiler and test driver
ifeq ($(OS),Windows_NT)
<<<<<<< HEAD
MRBC = ../bin/mrbc.exe
EXE := $(TARGET).exe
else
MRBC = ../bin/mrbc
EXE := $(TARGET)
=======
MRBC = ../bin/mrbc.exe
MRUBY= ../bin/mruby.exe
EXE := $(TARGET).exe
@@ -65,7 +58,6 @@ else
MRBC = ../bin/mrbc
MRUBY= ../bin/mruby
EXE := $(TARGET)
>>>>>>> upstream/master
endif
##############################