Merge remote branch 'refs/remotes/aparajita/runtime-attributes'

Conflicts:
	Tools/nib2cib/NSNibConnector.j
This commit is contained in:
Aparajita Fishman
2011-06-04 10:39:50 -07:00
15 changed files with 1120 additions and 2 deletions
+1
View File
@@ -37,6 +37,7 @@
@import "CPCibControlConnector.j"
@import "CPCibLoading.j"
@import "CPCibOutletConnector.j"
@import "CPCibRuntimeAttributesConnector.j"
@import "CPClipView.j"
@import "CPCollectionView.j"
@import "CPCollectionViewItem.j"