| commit | 9fb8ec2881f24724d6fe71bbfecb7524e95053a7 | |
| author | Tomas Gavenciak <gavento@ucw.cz> | |
| Thu, 24 Nov 2011 22:26:08 +0000 (24 23:26 +0100) | ||
| committer | Tomas Gavenciak <gavento@ucw.cz> | |
| Thu, 24 Nov 2011 22:26:08 +0000 (24 23:26 +0100) | ||
| tree | a0b75de18d576d3dc89186256214f61b7d027797 | treesnapshot (tar.gz zip) |
| parent | 22d47ec8e304affafa567d890965992088bd08a6 | commitdiff |
| parent | 3cca227bd9d97802da766c2feca0bb537c038b16 | commitdiff |
Merge branch 'pywrap' of git://repo.or.cz/gfxprim into pywrap
Conflicts:
include/core/swigify.sh
include/loaders/swigify.sh
Conflicts:
include/core/swigify.sh
include/loaders/swigify.sh