Merge from trunk

This commit is contained in:
David Gálvez
2014-07-10 11:09:09 +00:00
parent 98dacfbc69
commit 9a93782b77
54 changed files with 3647 additions and 1000 deletions

View File

@@ -29,7 +29,7 @@
*/
#define MAJOR_VERSION 0
#define MINOR_VERSION 83
#define MINOR_VERSION 85
#endif /* VERSION_H_ */