diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
| commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
| tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /solaris/Makefile.am | |
| parent | 01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff) | |
| parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) | |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'solaris/Makefile.am')
| -rw-r--r-- | solaris/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/solaris/Makefile.am b/solaris/Makefile.am index ecaf9b9b..dcee240c 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -1,5 +1,4 @@ # Solaris packages automake file -# $Id$ # XXX This file uses GNU make extensions. |