diff options
| -rw-r--r-- | src/tools/db-merger.c | 3 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c index 547b82e04..0a5050b8c 100644 --- a/src/tools/db-merger.c +++ b/src/tools/db-merger.c @@ -1464,7 +1464,8 @@ int main(int argc, char *argv[]) goto waiting_for_input3; } } /* NO COLLISION (biptr) */ - insert_bot(bi); + else + insert_bot(bi); } } else nobot = 1; diff --git a/version.log b/version.log index 23516c1ee..736811f08 100644 --- a/version.log +++ b/version.log @@ -9,9 +9,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="4" VERSION_EXTRA="-svn" -VERSION_BUILD="2991" +VERSION_BUILD="2993" # $Log$ # Changes since the 1.8.4 Release +#Revision 2993 - Fixed db-mergers handling of bot collisions #Revision 2991 - Fixed a crash on shutdown when running Anope on Mac #Revision 2981 - Fixed SQUITing juped servers on InspIRCd 1.2 #Revision 2978 - Added param to EVENT_CHANGE_NICK for old nickname |