tree d64af158741972a8c2703ae801899a5616403180
parent 80e0d203e8f39eb0bbddf9aa71852a7b7bc73833
parent f4b900e494f94c065a2dd58ad9b827391e49340c
author Alex Afanasyev <alexander.afanasyev@ucla.edu> 1360302244 +0000
committer Gerrit Code Review <gerrit@Git.irl.CS.UCLA.EDU> 1360302244 +0000

Merge "Changed name of preferences window to settings to match view settings tab"