From 1884934b9d60ea304613a7136cd16d5b4f7bee21 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Wed, 9 Jul 2014 21:07:22 -0700 Subject: [PATCH] Final migration commit Update versions to match the last commit on Google code. All subsequent commits will be on GH. --- .../FractoriumInstaller.wixproj | 2 +- .../VS2010/FractoriumInstaller/Product.wxs | 4 ++-- Source/Ember/EmberDefines.h | 2 +- Source/EmberAnimate/EmberAnimate.rc | 8 ++++---- Source/EmberGenome/EmberGenome.rc | 8 ++++---- Source/EmberRender/EmberRender.rc | 8 ++++---- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/Fractorium.rc | Bin 4574 -> 4574 bytes 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj b/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj index dbc585f..c74b043 100644 --- a/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj +++ b/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_Beta_0.4.0.3 + Fractorium_Beta_0.4.0.4 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs b/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs index 024f326..4a6c5b4 100644 --- a/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs +++ b/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + - <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.0.3 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> + <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.0.4 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> Qt::RichText diff --git a/Source/Fractorium/Fractorium.rc b/Source/Fractorium/Fractorium.rc index 34e846b690d8fa260f686ea9d08b5aeeafa20451..370d111a72b3f92c508e135d550c8d511cc3ad08 100644 GIT binary patch delta 46 wcmcbod{23U7YC!sWN!{bMw8989PG?Mjv|-%WC32W&6~KHm>}HEXLyBJ04}x*xBvhE delta 46 wcmcbod{23U7YC#9WN!{bM&r%39PG?Mjv|-%WC32W&6~KHm>}HEXLyBJ04_}nv;Y7A