Ignore:
Timestamp:
Jun 19, 2013, 8:50:28 AM (7 years ago)
Author:
Bruno Cornec
Message:

2nd phase for svn merge -r 2935:3146 ../3.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.1/mondo/src/mondorestore/mondo-prep.c

    r3147 r3148  
    14211421    char *tmp1 = NULL;
    14221422    char *tmp1 = NULL;
     1423    char *tmp1 = NULL;
    14231424
    14241425    /** end *************************************************************/
     
    22632264    } else if (strcmp(format, "btrfs") == 0) {
    22642265              strcpy(program, "mkfs.btrfs");
     2266    } else if (strcmp(format, "btrfs") == 0) {
     2267              strcpy(program, "mkfs.btrfs");
    22652268    } else if (strcmp(format, "minix") == 0) {
    22662269        mr_asprintf(program, "mkfs.minix");
Note: See TracChangeset for help on using the changeset viewer.