24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-24 22:25:47 +02:00
Commit Graph

8 Commits

Author SHA1 Message Date
W. Andrew Loe III
d9c01e8ed9 Ignore OS X libraries. 2010-12-15 17:01:14 +01:00
Badlop
62357b9589 Add extract_translations.beam to gitignore 2010-11-17 22:35:33 +01:00
Badlop
76f7548935 Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler)
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.

Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
2010-10-15 16:29:47 +02:00
Badlop
95ce77f80d Include a gitignore file in the ejabberd git repository (EJAB-1312) 2010-10-14 19:53:31 +02:00
Badlop
2e1bb5f0e6 * .gitignore: Removed (EJAB-441)
* src/.cvsignore: Likewise

SVN Revision: 1021
2007-12-04 21:40:25 +00:00
Jérôme Sautret
96ded4535d * src/ejabberd_s2s.erl: don't use the resource of the sender to choose
a s2s connection to ensure that a muc room always uses the same
connection

Merge branch 'ejabberd_s2s'

Conflicts:

.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl

SVN Revision: 963
2007-10-30 17:38:40 +00:00
Mickaël Rémond
9dd8e1bf04 Ignore more files in git.
SVN Revision: 940
2007-09-14 14:19:35 +00:00
Mickaël Rémond
d7e8374a07 Don't track some files in git.
SVN Revision: 939
2007-09-14 14:19:22 +00:00