Merge in changes from the trunk

This commit is contained in:
adustman
2005-04-03 04:23:18 +00:00
parent 92fb64114b
commit a4892cd07e
5 changed files with 19 additions and 9 deletions

View File

@ -1,5 +1,5 @@
#define version_info "(1,1,10,'final',1)"
#define __version__ "1.1.10"
#define version_info "(1,2,0,'final',1)"
#define __version__ "1.2.0"
/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by