summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKatze Miau <miaukatzemiau@priveasy.de>2011-10-19 09:50:03 (GMT)
committerKatze Miau <miaukatzemiau@priveasy.de>2011-10-19 09:50:03 (GMT)
commit5ae967dc38bf6504eaefe525e3d874f4c19b6ec4 (patch)
tree25cc3810e36d0b3949c43cd13fea86013573269d /Makefile
parentac705f586ef3f7c08b2952e55508e65bba0be168 (diff)
parenta405107d25aaef0ef4f3cd915bdee1b68830a203 (diff)
Merge gitorious.org:+freifunk-jena/freifunk-jena-batman-config/freifunk-jena-batman-config-v2
Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 226eccd..513e2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -32,4 +32,4 @@ image/%: openwrt/$$(REPO)/.repo_access config/$$(REPO).config \
rsync -a files/$(PLATFORM)-$(MODEL)/ openwrt/$(REPO)/files/
cd openwrt/$(REPO) && $(MAKE)
mkdir -p $@
- rsync -a openwrt/$(REPO)/bin/$(PLATFORM)/ $@/ \ No newline at end of file
+ rsync -a openwrt/$(REPO)/bin/$(PLATFORM)/ $@/
contact: Jan Huwald // Impressum