Merge remote branch 'remotes/origin/master'

[git.ikiwiki.info.git] / doc / bugs / xgettext_issue.mdwn

diff --git a/doc/bugs/xgettext_issue.mdwn b/doc/bugs/xgettext_issue.mdwn
index 5abc65c04e18b423f77ebaa749f0e5284fe62829..dc49c69a1805062a5220ece158c7453652292d20 100644 (file)
--- a/doc/bugs/xgettext_issue.mdwn
+++ b/doc/bugs/xgettext_issue.mdwn
@@ -67,3 +67,7 @@ make: *** [extra_build] Error 2
 
 >>>>>> Other than installing a newer version of `gettext` from outside of the repos, is there any workaround?  
 
+>>>>>>> It's probably because you're pulling it from svn, and I don't
+>>>>>>> always update the pot file every time I commit to svn. So this will
+>>>>>>> affect svn checkouts, but not released tarballs. Anyway, I put in a
+>>>>>>> workaround.. [[bugs/done]] --[[Joey]]