aboutsummaryrefslogtreecommitdiffstats
path: root/sequel-pro.xcodeproj/project.pbxproj
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2014-10-26 21:14:02 +0100
committerMax <post@wickenrode.com>2014-10-26 21:14:02 +0100
commit6d48720a8279e7e97e9a225aab34c0688abd8e00 (patch)
tree3e2b326036ab186dbacc05afe1391230e89395f4 /sequel-pro.xcodeproj/project.pbxproj
parent68d3620a5277293959f5f86efcf53680ddba9152 (diff)
parentfc506ec5997ed43383f264011ed8237706821e95 (diff)
downloadsequelpro-6d48720a8279e7e97e9a225aab34c0688abd8e00.tar.gz
sequelpro-6d48720a8279e7e97e9a225aab34c0688abd8e00.tar.bz2
sequelpro-6d48720a8279e7e97e9a225aab34c0688abd8e00.zip
Merge branch 'master' of https://github.com/sequelpro/sequelpro
Conflicts: Source/SPGotoDatabaseController.m
Diffstat (limited to 'sequel-pro.xcodeproj/project.pbxproj')
0 files changed, 0 insertions, 0 deletions