colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 23:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,145 Commits 12 Branches 92 Tags
7c71cd1f80b5cd88e656ea1d9afcbd3254cfd9bc
Commit Graph
4 Commits
Author SHA1 Message Date
Martin Carlberg 74ad0faffa Merge branch 'master' of https://github.com/cappuccino/cappuccino into objj_compiler2 
Conflicts:
	AppKit/CPWindow/CPWindow.j
 2013-01-10 19:28:42 +01:00
Martin Carlberg d20fb2039a Missed some lines in manual merge 2013-01-08 14:34:29 +01:00
Martin Carlberg 1c3411f808 Merge remote-tracking branch 'upstream/master' into objj_compiler2 
Conflicts:
	AppKit/CPWindow/CPWindow.j
 2013-01-08 09:25:54 +01:00
Martin Carlberg b52217e8a0 Tried to make the import mess a little better. Fixed a lot of bugs. Changed some class names in the test cases. Looks like all the tests are being run in the same space. Has to look into this….. 2012-12-17 00:40:26 +01:00