git.stderr.nl Git - matthijs/projects/xerxes.git/commit

projects / matthijs / projects / xerxes.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 381c81a 86b65f4)

author	Matthijs Kooijman <m.kooijman@student.utwente.nl>
	Mon, 15 Jun 2009 10:01:42 +0000 (12:01 +0200)
committer	Matthijs Kooijman <m.kooijman@student.utwente.nl>
	Mon, 15 Jun 2009 10:01:42 +0000 (12:01 +0200)
commit	884bf66b55546555bfd3df318b9318e8358b02cf
tree	6a3bd2dac036f0c066086f650d3fd775d1a1de3e	tree \| snapshot
parent	381c81a8ffac8c4b3abf6a762d031a7e261e8eaa	commit \| diff
parent	86b65f4079fac913522a51968bd0ef73c903427a	commit \| diff

Merge branch 'production'

* production:
  Remove SQL password from import.py.
  Add code to support disabling new influences.
  Remove \r's.
  Only notify a player of finished influence changes.

influences/notify.py	diff1 \|	diff2 \|	blob \| history
templates/influences/influence_detail.html	diff1 \|	diff2 \|	blob \| history

Xerxes - Evolution Events informatiesysteem