From: Steve Scaffidi <sscaffidi@gmail.com>
Date: Fri, 11 Sep 2009 21:02:56 +0000 (-0400)
Subject: Merge commit 'c0baaa7'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c6b0b7550fc1cb81185e5e63a2b1abd360f8f40a;hp=afbe012678ecefed824b148a88598a7240e6198b;p=urisagit%2FStem.git

Merge commit 'c0baaa7'
---

diff --git a/.gitignore b/.gitignore
index ec302ab..6af5e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,20 @@ blib/
 # Temp, old and emacs backup files.
 *~
 *.old
-old*
 \#*#
 .#*
 .*.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
@@ -34,4 +38,3 @@ slides
 stem2pod
 test
 
-
diff --git a/BuildStem.pm b/BuildStem.pm
index 4617d19..a6aa8cb 100644
--- a/BuildStem.pm
+++ b/BuildStem.pm
@@ -47,7 +47,6 @@ sub process_conf_files {
 	my $conf_dir = File::Spec->catdir($self->blib, 'conf');
 	File::Path::mkpath( $conf_dir );
 
-
 	foreach my $file (keys %$files) {
 		my $result = $self->copy_if_modified($file, $conf_dir, 'flatten') or next;
 		$self->fix_shebang_line($result) if $self->is_unixish();
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 873403d..7408d6d 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -26,3 +26,4 @@
 
 # other stuff we dont want in the dist tarball
 ^notes/
+
diff --git a/bin/chat2_demo b/bin/chat2_demo
index b23a14f..1340a79 100755
--- a/bin/chat2_demo
+++ b/bin/chat2_demo
@@ -7,7 +7,10 @@ $xskip = ( $^O eq 'solaris' ) ? 600 : 500 ;
 
 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;
diff --git a/srs_notes.txt b/srs_notes.txt
new file mode 100644
index 0000000..7b3e6c3
--- /dev/null
+++ b/srs_notes.txt
@@ -0,0 +1,6 @@
+Odd sort of behavior... when dumping \%:: with Data::Dumper in Stem/Conf.pm
+(insert a print @ line 234)
+
+the program just "freezes"...
+
+