Anyone on the commit list will see some massive diffs from merging the branch to the trunk.
I did the merge manually with FileMerge, which isn't the most svn- friendly way to do it. Since either svn or I screwed things up silently last time I tried merging with svn, I didn't want to mess with it. Currently it compiles, launches, and basic viewing works. A few things that are likely broken: - MainMenu.nib; I know there are new/different menu items - IBOutlet NSPopUpButton *searchBookmarkPopUp in BibDocument; no idea what this was connected to in the nib, and I didn't realize there were changes to BibDocument.nib. ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ Bibdesk-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bibdesk-develop
