Merge branch 'master' into qt
authorEd Page <eopage@byu.net>
Thu, 2 Dec 2010 02:54:30 +0000 (20:54 -0600)
committerEd Page <eopage@byu.net>
Thu, 2 Dec 2010 02:54:30 +0000 (20:54 -0600)
commit299dac7f566eab1c894a2dae1971decaa205dadd
tree90e6398e89eeafae8b24e0759185f88f29631202
parent1a30f04f6e4d03e591aaa936b64a61f6e0c4ff95
parentb2e01d3835f78324850616999a96f0f971a0c83d
Merge branch 'master' into qt

Conflicts:
src/constants.py