| commit | a0d395a7ad01d1544f57e8b04b4ba24f66c368db | |
| author | syso <syso@altix.(none)> | |
| Wed, 3 Mar 2010 02:42:17 +0000 (3 03:42 +0100) | ||
| committer | syso <syso@altix.(none)> | |
| Wed, 3 Mar 2010 02:42:17 +0000 (3 03:42 +0100) | ||
| tree | 759343ddfe32ae6e566b7db900afb8e8edcbc905 | treesnapshot (tar.gz zip) |
| parent | 3b5a02ebf002754a20dfaf57aa4c59a27e002284 | commitdiff |
| parent | 172aff5c9ce1bdf14b380a814c4313a159718928 | commitdiff |
Merge branch 'experimental'
Conflicts:
src/hw/pinning.h
FIX: As the file was no longer needed and is still
considered "unstable", it can be kept as a conflict,
as it's not going to be used in the current environment.
Conflicts:
src/hw/pinning.h
FIX: As the file was no longer needed and is still
considered "unstable", it can be kept as a conflict,
as it's not going to be used in the current environment.
| src/hw/pinning.h | diff1 | diff2 | blobhistory |