| commit | b8e92ac8655c4808bea4d4d65cc51802a2246e76 | |
| author | taj <khan@oxus.(none)> | |
| Fri, 1 Mar 2013 18:43:22 +0000 (1 19:43 +0100) | ||
| committer | taj <khan@oxus.(none)> | |
| Fri, 1 Mar 2013 18:43:22 +0000 (1 19:43 +0100) | ||
| tree | b9aa15071b03e4a360bb553bbd8a218434d8d804 | treesnapshot (tar.gz zip) |
| parent | 7d78f77ca5e32e65c36daa9a741dc67ced4a755a | commitdiff |
| parent | 9295e3d972766e9030fbb6da985940454c35d6e3 | commitdiff |
Merge branch 'master' of ssh://repo.or.cz/srv/git/converter
Conflicts:
converter-0.0.1/Makefile.am
converter-0.0.1/source/osl2scoplib.c
converter-0.0.1/source/scoplib2osl.c
Conflicts:
converter-0.0.1/Makefile.am
converter-0.0.1/source/osl2scoplib.c
converter-0.0.1/source/scoplib2osl.c