| commit | e4a46d8e86b3a14decc010d5cbd371922bdbb94b | |
| author | Michal Soltys <soltys@ziu.info> | |
| Wed, 4 May 2011 13:46:29 +0000 (4 15:46 +0200) | ||
| committer | Michal Soltys <soltys@ziu.info> | |
| Wed, 4 May 2011 13:46:29 +0000 (4 15:46 +0200) | ||
| tree | d58aabf4be68f2d83fad4252840cfb2888252f5b | treesnapshot (tar.gz zip) |
| parent | 22411fad71c8949dbbe5880ae8a65043ca858872 | commitdiff |
| parent | cf3ba289e440cc9e764243a02b8a474ebde70da7 | commitdiff |
Merge branch 'master' into chaindev
Conflicts:
com32/Makefile
com32/modules/chain.c
Note: add ReactOS' stuff introduced in old chain.c
Signed-off-by: Michal Soltys <soltys@ziu.info>
Conflicts:
com32/Makefile
com32/modules/chain.c
Note: add ReactOS' stuff introduced in old chain.c
Signed-off-by: Michal Soltys <soltys@ziu.info>