From: Saverio Proto <zioproto@gmail.com>
Date: Sun, 8 Jun 2014 09:00:27 +0000 (+0200)
Subject: olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.
X-Git-Url: http://git.ozo.com/?p=lede-routing%2F.git;a=commitdiff_plain;h=aa9af551d0bf027ec683c04c4ea15a773b43af67

olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.
---

aa9af551d0bf027ec683c04c4ea15a773b43af67
diff --cc olsrd/Makefile
index df8d068,5004b5f..d151674
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@@ -8,8 -8,8 +8,8 @@@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=olsrd
 -PKG_VERSION:=0.6.6.1
 -PKG_RELEASE:=4
 +PKG_VERSION:=0.6.6.2
- PKG_RELEASE:=1
++PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6