Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorhackbard <hackbard@hackdaworld.org>
Sat, 31 May 2008 01:47:01 +0000 (03:47 +0200)
committerhackbard <hackbard@hackdaworld.org>
Sat, 31 May 2008 01:47:01 +0000 (03:47 +0200)
Conflicts:

posic/sync.sh

1  2 
posic/sync.sh

diff --cc posic/sync.sh
@@@ -5,7 -5,7 +5,8 @@@ if [ "`hostname`" != "sage" ]; the
  fi
  
  $RSYNC -e "ssh -p 3389" $SRC/img/ ./img/
 +$RSYNC -e "ssh -p 3389" $SRC/figs/ ./figs/
+ $RSYNC -e "ssh -p 3389" $SRC/plot/ ./plot/
  
  $RSYNC -e "ssh -p 3389" $SRC/talks/*.pdf ./talks/