Aparajita Fishman 89ce904850 Merge remote branch 'refs/remotes/280north/master' into my_master ...

Conflicts:
	AppKit/CPButton.j
	AppKit/Themes/Aristo/ThemeDescriptors.j
	AppKit/Themes/BlendKit/BKThemeDescriptor.j
	Foundation/CPArray.j
	Jakefile
	Tests/Foundation/CPArrayPerformanceTest.j
	Tools/Documentation/Cappuccino.doxygen
	Tools/Documentation/cleanup_headers
	Tools/Documentation/make_headers

2010-08-22 09:03:12 -04:00

..

Cappuccino.doxygen

Merge remote branch 'refs/remotes/280north/master' into my_master

2010-08-22 09:03:12 -04:00

cleanup_headers

Fixes/enhancements to jake docs:

2010-08-13 15:42:43 -07:00

make_headers

Merge remote branch 'refs/remotes/280north/master' into my_master

2010-08-22 09:03:12 -04:00

make_headers.sh

Made sure to remove the .doc directories first, fixed exec

2010-08-09 15:41:00 -04:00