diff options
| author | 2010-01-26 10:27:12 -0800 | |
|---|---|---|
| committer | 2010-01-26 10:27:12 -0800 | |
| commit | 98a61ef5929d9c48b3beb594b062def9ad1d4f3b (patch) | |
| tree | 69d36b0ffbfcc97ea7702c0a47e985d347caefc2 /libs/ui/FramebufferNativeWindow.cpp | |
| parent | d77667f3b3cca8c1f0c98a1d4575df823edbd524 (diff) | |
| parent | 696f0adeef370c9bae63d6ae2d6bfb937225bdcd (diff) | |
am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'
* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
DO NOT MERGE
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions