diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:51:17 +0200 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:51:17 +0200 |
| commit | 970976d2758c659dc41ffabf9bc9b160c8fbc29b (patch) | |
| tree | d9563c8e4d5018dae924b4b1355933b668c9b951 /Makefile | |
| parent | 4e51e3a4c2b3006f8ce760ebcdc424b9c7a3eeb4 (diff) | |
| parent | d7dc6141c91b48c410e9cc5734ca9a2adecc278e (diff) | |
| download | vdr-plugin-eepg-970976d2758c659dc41ffabf9bc9b160c8fbc29b.tar.gz vdr-plugin-eepg-970976d2758c659dc41ffabf9bc9b160c8fbc29b.tar.bz2 | |
Merge branch 'master' into experimental
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -102,11 +102,15 @@ OBJS = $(PLUGIN).o dish.o epghandler.o setupeepg.o equivhandler.o util.o eit2.o ### The main target: +<<<<<<< HEAD ifdef API1733 all: libvdr-$(PLUGIN).so i18n else all: $(SOFILE) i18n endif +======= +all: $(SOFILE) +>>>>>>> master ### Implicit rules: |