Merge remote-tracking branch 'gravitystorm/sparkification'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:55:08 +0000 (16:55 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:55:08 +0000 (16:55 +0100)
commitaac2d8bc74235193b0b52ea93e78f6209864cdc0
treec81e6e122f43157af5c5428be7e5d0a94f44d2cb
parent41244ff21dc01813b54498bab44f87dc1f300317
parentf4a455cad20df3d483564ac90111e2cf6e20ab8e
Merge remote-tracking branch 'gravitystorm/sparkification'
net/systemeD/potlatch2/BackgroundSelector.mxml
net/systemeD/potlatch2/StyleSelector.mxml
net/systemeD/potlatch2/collections/Imagery.as
net/systemeD/potlatch2/collections/Stylesheets.as
net/systemeD/potlatch2/dialogs/BackgroundDialog.mxml
net/systemeD/potlatch2/dialogs/OptionsDialog.mxml
net/systemeD/potlatch2/dialogs/VectorSourceDialog.mxml
potlatch2.mxml