Permalink
Please sign in to comment.
Browse files
Merge branch 'master' of https://github.com/sequelpro/sequelpro
Conflicts: Source/SPGotoDatabaseController.m
- Loading branch information...
Showing
with
1,150 additions
and 4,107 deletions.
- +397 −3,956 Interfaces/English.lproj/DBView.xib
- +681 −117 Interfaces/English.lproj/GotoDatabaseDialog.xib
- +1 −1 Source/SPAppController.h
- +5 −1 Source/SPGotoDatabaseController.h
- +66 −32 Source/SPGotoDatabaseController.m
Oops, something went wrong.
0 comments on commit
6d48720