Changeset [d76543467931426b5d6eed96c4b0eb9f95175670] by neyric
Revision d76543467931426b5d6eed96c4b0eb9f95175670,
committed by neyric
· March 4th, 2010 @ 02:34 AM
Merge branch 'master' of git://github.com/ciaranj/wireit into group-container
Conflicts:
js/WiringEditor.js
http://github.com/neyric/wireit/commit/d76543467931426b5d6eed96c4b0...
42 changed files
-
A
GroupDoc/Collapsed 1.png -
A
GroupDoc/CollapsedAndUncollapsed.png -
A
GroupDoc/CollapsedAndUncollapsedGroupSelector.png -
A
GroupDoc/CollapsedAndUncollapsedSuperHighlighted.png -
A
GroupDoc/Made Group.png -
A
GroupDoc/Remapping.png -
A
GroupDoc/SelectedContainers.png -
A
GroupDoc/images/GroupCollapsed.png -
A
GroupDoc/images/GroupMade.png -
A
GroupDoc/images/GroupsWithinAGroupSuperHighlight.png -
A
GroupDoc/images/NestedGroupSelection.png -
A
GroupDoc/images/SelectGroup.png -
A
GroupDoc/images/raw/GroupCollapsed.xcf -
A
GroupDoc/images/raw/GroupMade.xcf -
A
GroupDoc/images/raw/GroupsWithinAGroupSuperHighlight.xcf -
A
GroupDoc/images/raw/NestedGroupSelection.xcf -
A
GroupDoc/images/raw/SelectGroup.xcf -
A
GroupDoc/readme.txt -
A
examples/WiringEditor/embedded.html -
A
examples/WiringEditor/embedded.js -
A
examples/WiringEditor/generate.html -
A
images/brick_add.png -
A
images/brick_delete.png -
A
images/brick_edit.png -
A
images/bricks.png -
A
images/cancel.png -
A
images/group.png -
A
js/Group.js -
A
js/GroupFormContainer.js -
A
js/GroupUtils.js -
A
js/Grouper.js -
A
js/RubberBand.js -
M
css/WireIt.css -
M
js/Container.js -
M
js/ImageContainer.js -
M
js/InOutContainer.js -
M
js/Layer.js -
M
js/Terminal.js -
M
js/Wire.js -
M
js/WiringEditor.js -
M
js/util/inputex/FormContainer-beta.js -
M
js/util/inputex/WirableField-beta.js