Commit Graph
4 Commits
Author SHA1 Message Date
Ross Boucher 62e44d3d12 Merging conflict
Merge branch 'master' into merge_branch

Conflicts:
	AppKit/Cib/CPCustomView.j
2008-09-10 16:46:32 -07:00
Ross Boucher a40fbd7961 Add the first draft of documentation inline. 2008-09-10 15:11:37 -07:00
Francisco Ryan Tolmasky I 4a858cda3e Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/30-make-nib2cib-work-with-new-build-system#ticket-30-1.
[#30 state:resolved]

Reviewed by tom.
2008-09-09 14:57:53 -07:00
Francisco Ryan Tolmasky I a97bb72800 Initial commit.
Reviewed by francisco, ross and tom.
2008-09-04 03:52:20 -07:00