From: Steve Scaffidi <sscaffidi@gmail.com>
Date: Fri, 11 Sep 2009 21:00:46 +0000 (-0400)
Subject: Merge commit 'origin/master' into HEAD
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c0baaa7d3112ec2b6d1561fe62bdf9e46a808b42;p=urisagit%2FStem.git

Merge commit 'origin/master' into HEAD

Conflicts:
	.gitignore
	BuildStem.pm
	MANIFEST
	MANIFEST.SKIP
	bin/chat2_demo
	bin/run_stem
---

c0baaa7d3112ec2b6d1561fe62bdf9e46a808b42
diff --cc .gitignore
index 403a422,ec302ab..6af5e59
--- a/.gitignore
+++ b/.gitignore
@@@ -19,4 -18,20 +18,23 @@@ blib
  \#*#
  .#*
  .*.swp
 -lib-pod
 +
++# archive files
++*.gz
++*.bz2
++
++# stuff from uri's working dir that he doesn't want in the repo
++old*
+ *.ok
++lib-pod
+ modules
 -
+ event_test
 -*.gz
+ dlug
+ flow
+ intel
+ pod
+ scaffidi
+ slides
+ stem2pod
+ test
+ 
 -
diff --cc MANIFEST.SKIP
index ac21002,873403d..7408d6d
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@@ -20,3 -23,6 +23,7 @@@
  ^#.*#$
  ^\.#
  \.*.swp$
+ 
+ # other stuff we dont want in the dist tarball
+ ^notes/
++
diff --cc bin/chat2_demo
index 9a4ec6f,b23a14f..1340a79
--- a/bin/chat2_demo
+++ b/bin/chat2_demo
@@@ -7,6 -7,7 +7,10 @@@ $xskip = ( $^O eq 'solaris' ) ? 600 : 5
  
  use File::Basename qw( basename );
  $ENV{PATH} .= ':' . basename( $0 ) . ':.';
++<<<<<<< HEAD:bin/chat2_demo
++=======
+ 
++>>>>>>> origin/master:bin/chat2_demo
  for my $prog qw( run_stem xterm telnet ) {
      die "Can't find $prog in PATH\n" if
          system( "which $prog >/dev/null 2>&1" ) != 0;