Conflicts:
.gitignore
BuildStem.pm
MANIFEST
MANIFEST.SKIP
bin/chat2_demo
bin/run_stem
# 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
stem2pod
test
-
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();
# other stuff we dont want in the dist tarball
^notes/
+
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;
--- /dev/null
+Odd sort of behavior... when dumping \%:: with Data::Dumper in Stem/Conf.pm
+(insert a print @ line 234)
+
+the program just "freezes"...
+
+