Просмотр исходного кода

Merge branch 'master' into next

* master:
Bryan Drewery 10 лет назад
Родитель
Сommit
6b11d7b343
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      doc/UPDATES.md

+ 1 - 1
doc/UPDATES.md

@@ -8,7 +8,6 @@
     will properly assign roles out to bots to not cause overlap. Only leaf
     will properly assign roles out to bots to not cause overlap. Only leaf
     bots know which bots have which roles. (#39)
     bots know which bots have which roles. (#39)
   * Add cmd_roles (leaf only) to display roles for a channel. (#39)
   * Add cmd_roles (leaf only) to display roles for a channel. (#39)
-  * Fix some various internal caching issues.
 
 
 # master
 # master
   * Require C++11 compiler support (G++ 4.7+, clang32+)
   * Require C++11 compiler support (G++ 4.7+, clang32+)
@@ -51,6 +50,7 @@
   * Fix bot forgetting its nick/jupenick during restart and reverting to
   * Fix bot forgetting its nick/jupenick during restart and reverting to
     botnick if restarting in the middle of a server connect or attempted
     botnick if restarting in the middle of a server connect or attempted
     NICK change that fails.
     NICK change that fails.
+  * Fix some various internal caching issues.
 
 
 # 1.4.6
 # 1.4.6
   * Disable demo TCL support by default to prevent confusion during build.
   * Disable demo TCL support by default to prevent confusion during build.