Limnoria/.gitignore at 40675ffdfa6c26cdc28125580e6e1eeea65fd41b - Limnoria - GitCom: Git with a cup of Com

Mikaela/Limnoria

mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-15 07:04:53 +01:00

Valentin Lorentz 40675ffdfa Merge remote-tracking branch 'supybot/master' into testing

Conflicts:
	plugins/Admin/plugin.py
	plugins/BadWords/config.py
	plugins/Filter/plugin.py
	plugins/Google/plugin.py
	plugins/Math/plugin.py
	plugins/Misc/plugin.py
	plugins/Note/plugin.py
	plugins/RSS/plugin.py
	plugins/Seen/test.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	plugins/Status/plugin.py
	plugins/String/config.py
	plugins/String/plugin.py
	plugins/Time/plugin.py
	plugins/Todo/plugin.py
	plugins/Web/plugin.py
	plugins/__init__.py
	scripts/supybot-botchk
	setup.py
	src/__init__.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	src/drivers/Socket.py
	src/ircdb.py
	src/irclib.py
	src/ircutils.py
	src/questions.py
	src/registry.py
	src/schedule.py
	src/test.py
	src/utils/file.py
	src/utils/gen.py
	src/utils/net.py
	src/utils/web.py
	src/world.py

2013-08-24 11:28:29 +02:00

23 lines

217 B

Plaintext

Raw Blame History

 backup
 build
 dist
 supybot.egg-info
 test-data
 test-conf
 test-logs
 *.pyc
 docs/_build
 docs/plugins
 *.swp
 *.swo
 *~
 *.mo
 debian/limnoria*
 debian/python-module-stampdir/
 dist/
 push.sh
 merge.sh
 src/version.py
 MANIFEST
 py3k/