Changeset 3e9485d for .gitignore


Ignore:
Timestamp:
Nov 2, 2008, 3:06:37 PM (12 years ago)
Author:
Evan Broder <broder@mit.edu>
Children:
e729e3b
Parents:
f8d0bc0 (diff), 43a306c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'master' into debian

Conflicts:
	.gitignore
File:
1 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r10e0ab8 r3e9485d  
    11*~
     2*.a
     3autom4te.cache
     4barnowl
     5blib
     6config.cache
     7config.h
     8config.log
     9config.status
     10configure
     11core
     12jabber.log
    213libfaim/rxhandlers.c.orig
     14Makefile
     15META.yml
     16*.o
     17owl_prototypes.h
     18owl_prototypes.h.new
     19*.par
     20perlglue.c
     21perlwrap.c
     22pm_to_blib
     23TAGS
     24tester
     25varstubs.c
Note: See TracChangeset for help on using the changeset viewer.