Merged changes in the trunk up to revision 33112.

2010-11-17 00:58:03 +00:00
parent a95181a7a0 12afa64de9
commit 09ba291c55
273 changed files with 4166 additions and 3669 deletions
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -703,6 +703,8 @@ class USERPREF_PT_file(bpy.types.Panel):
        col.prop(paths, "use_load_ui")
        col.prop(paths, "use_filter_files")
        col.prop(paths, "show_hidden_files_datablocks")
+        col.prop(paths, "hide_recent_locations")
+        col.prop(paths, "show_thumbnails")

        col.separator()
        col.separator()