Merge commit '546da9bac7135d7d1b02dce0c0eef2209d939fc6' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:56:22 +0000 (00:56 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:56:22 +0000 (00:56 -0500)
Conflicts:
templates/page.tmpl

1  2 
IkiWiki/Plugin/git.pm
IkiWiki/Wrapper.pm
po/Makefile
templates/editpage.tmpl

Simple merge
Simple merge
diff --cc po/Makefile
index c1c37443b3002b45c08dc248640430e5e04d8210,5ec4a157c6ddbb0fdfcdea3d117730b3cb2ea266..961763d058b42b9b65dd66967d4cc71ec3b8899c
@@@ -23,10 -36,12 +23,10 @@@ ikiwiki.pot: $(POTFILES
        fi
  
  clean:
 -      rm -f $(MOFILES) messages messages.mo *_stamp
 -      rm -rf html underlays/.ikiwiki $(TRANSLATED_UNDERLAYS)
 -      find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f
 +      rm -f $(MOFILES) messages messages.mo
  
  %.mo: %.po
-       msgfmt -o $@ $<
+       @if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi
  
  %.po: ikiwiki.pot
        @echo -n "Merging ikiwiki.pot and $@"
Simple merge