Merge branch 'master' of ssh://git.code.sf.net/p/yap/yap-6.3

Conflicts:
	docs/doxygen.rc
This commit is contained in:
Vítor Santos Costa
2014-05-06 13:59:28 +01:00
25 changed files with 2340 additions and 2069 deletions

File diff suppressed because it is too large Load Diff