Merge branch 'stable' into dual_socket
authorHenning Rogge <hrogge@googlemail.com>
Sat, 19 Dec 2009 21:27:52 +0000 (22:27 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sat, 19 Dec 2009 21:27:52 +0000 (22:27 +0100)
1  2 
lib/txtinfo/src/olsrd_txtinfo.c
src/bsd/net.c
src/linux/net.c
src/main.c

@@@ -477,12 -494,13 +494,12 @@@ ipc_print_mid(struct autobuf *abuf
    unsigned short is_first;
    struct mid_entry *entry;
    struct mid_address *alias;
  #ifdef ACTIVATE_VTIME_TXTINFO
-   abuf_puts(abuf, "Table: MID\nIP address\tVTime\tAliases\n");
+   abuf_puts(abuf, "Table: MID\nIP address\tAlias\tVTime\n");
  #else
    abuf_puts(abuf, "Table: MID\nIP address\tAliases\n");
- #endif
+ #endif /*vtime txtinfo*/
 -
    /* MID */
    for (idx = 0; idx < HASHSIZE; idx++) {
      entry = mid_set[idx].next;
diff --cc src/bsd/net.c
Simple merge
diff --cc src/linux/net.c
Simple merge
diff --cc src/main.c
Simple merge