diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /devtools/create_lure/Makefile | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'devtools/create_lure/Makefile')
| -rw-r--r-- | devtools/create_lure/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/devtools/create_lure/Makefile b/devtools/create_lure/Makefile deleted file mode 100644 index 1ed33b594c..0000000000 --- a/devtools/create_lure/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# $Id$ - -all: - g++ -I../.. create_lure_dat.cpp process_actions.cpp -o create_lure |