diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
commit | 293067f086565c294862b954bf58e1680d758280 (patch) | |
tree | cf5ebe06faba962952846ab2dc682cbdd62dadcd /pimd/pim_memory.h | |
parent | babeld: The sockaddr code is not passed through anymore (diff) | |
parent | Merge pull request #617 from donaldsharp/bgp_nexthop (diff) | |
download | frr-293067f086565c294862b954bf58e1680d758280.tar.xz frr-293067f086565c294862b954bf58e1680d758280.zip |
Merge remote-tracking branch 'origin/master' into babel
Diffstat (limited to 'pimd/pim_memory.h')
-rw-r--r-- | pimd/pim_memory.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pimd/pim_memory.h b/pimd/pim_memory.h index e366377c8..01189aca7 100644 --- a/pimd/pim_memory.h +++ b/pimd/pim_memory.h @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with Quagga; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; see the file COPYING; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _QUAGGA_PIM_MEMORY_H |