diff options
author | Dan Gudmundsson <[email protected]> | 2010-11-15 10:07:30 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2010-11-15 10:07:30 +0100 |
commit | b48be79573171e530d97cdf078488eb66fc23f30 (patch) | |
tree | 3b7da1fa6613b426c1247c9540795970f0f8fad4 /erts/obj | |
parent | 49f6d49d77adb123800f5ff7b7726a8aecb3a87c (diff) | |
parent | b5eac4ab9a7b63d90533e48531a025a99d45595f (diff) | |
download | otp-b48be79573171e530d97cdf078488eb66fc23f30.tar.gz otp-b48be79573171e530d97cdf078488eb66fc23f30.tar.bz2 otp-b48be79573171e530d97cdf078488eb66fc23f30.zip |
Merge branch 'dgud/erts/windows-vs10-express' into dev
* dgud/erts/windows-vs10-express:
Fix manifest files
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions