summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-merged-directory.h
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2012-11-22 19:35:40 -0800
committerSteve Zesch <[email protected]>2012-11-22 19:35:40 -0800
commitcbfe84ee50d01e523472a8e086add01245fad6bb (patch)
tree13e7583925eea4b5cb41d29d01aa3740d3683e9e /libcaja-private/caja-merged-directory.h
parentc5d3931543c2314a7c156045fd21805cc1ab8ddf (diff)
parentc7862d8bc2f25b627aab3d51577feaabb023a70e (diff)
downloadcaja-cbfe84ee50d01e523472a8e086add01245fad6bb.tar.bz2
caja-cbfe84ee50d01e523472a8e086add01245fad6bb.tar.xz
Merge pull request #55 from jasmineaura/develop
[directory-view] fix double-free regression from 7a42b9b0
Diffstat (limited to 'libcaja-private/caja-merged-directory.h')
0 files changed, 0 insertions, 0 deletions