]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb796b9 56c38c6)
Merge branch 'nautilus-saved' into nautilus
authorJosh Durgin <jdurgin@redhat.com>
Tue, 30 Mar 2021 18:38:17 +0000 (14:38 -0400)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 30 Mar 2021 18:38:17 +0000 (14:38 -0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.