search

esrf-bliss / Lima-camera-basler

Lima basler plugin
lima.blissgarden.org
GNU General Public License v3.0
4 stars 26 forks source link

Fix for windows compilation #7

Closed NexeyaSGara closed 10 years ago

NexeyaSGara commented 10 years ago

Change the name of the solution to ber compatible with the install script. Fix for using allocation in windows

esrf-bliss commented 10 years ago

Rejected....

You are not allowed to convert all line breaks of files: build/msvc/9.0/LibBasler/LibLimaBasler.sln build/msvc/9.0/LibBasler/LibLimaBasler.vcproj sip/BaslerInterface.sip

Moreover some commit in your patch are simply not a merge, because conflicts were not managed. i.e: commit 425ce0079 or 62783b22

next time please follow the guideline (http://lima.blissgarden.org/howto_contribute.html#contribute-guideline)