# # patch "ChangeLog" # from [d4819190423866ee99099cd292dcbfb0cc6fc031] # to [0e991ffef90b2bfbac1a84b236230d610ac4aaa8] # # patch "monotone.cc" # from [98b11bf6e7f980c5306436a2cf0f742b01b3659e] # to [7657b832c39dc0efdcd48647fb5e0079a851de8c] # ======================================================================== --- ChangeLog d4819190423866ee99099cd292dcbfb0cc6fc031 +++ ChangeLog 0e991ffef90b2bfbac1a84b236230d610ac4aaa8 @@ -1,3 +1,8 @@ +2005-11-27 Nathaniel Smith + + * monotone.cc: Include "i18n.h" instead of "libintl.h" directly, + to theoretically play better with autoconf stuff. + 2005-11-27 Julio M. Merino Vidal * tests/t_automate_stdio.at: Don't expect perl to be in /usr/bin; ======================================================================== --- monotone.cc 98b11bf6e7f980c5306436a2cf0f742b01b3659e +++ monotone.cc 7657b832c39dc0efdcd48647fb5e0079a851de8c @@ -16,10 +16,11 @@ #include #include -#include #include "botan/botan.h" +#include "i18n.h" + #include "app_state.hh" #include "commands.hh" #include "sanity.hh"