fixed conflict
authortanya <tanyshk@gmail.com>
Wed, 18 Aug 2010 06:05:45 +0000 (09:05 +0300)
committertanya <tanyshk@gmail.com>
Wed, 18 Aug 2010 06:05:45 +0000 (09:05 +0300)
commitd144dca98317093ceaf0cdcfb1c3d37ffc94be75
treeae5f5fdc6b072951e0c2623893099abfbce0a8ce
parent1e8bef7ac5059d131eda432ecf9fbe3afbb203d3
parent8f616a790293d2a1cd943ab46b1e3ce5c9a26383
fixed conflict
sherman-aquarium/shermans/Makefile
sherman-aquarium/shermans/screensaver.c