diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index 7f16873464..46fc9a8e4c 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
@@ -24,8 +24,8 @@
-
-
+
+
@@ -59,8 +59,8 @@
-
-
+
+
diff --git a/extras/Introjucer/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile
index 8ca3f27819..f7f7349ec4 100644
--- a/extras/Introjucer/Builds/Linux/Makefile
+++ b/extras/Introjucer/Builds/Linux/Makefile
@@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt
LDDEPS :=
- RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
TARGET := Introjucer
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -39,12 +39,12 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt
LDDEPS :=
- RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
TARGET := Introjucer
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
diff --git a/extras/Introjucer/Builds/MacOSX/Info.plist b/extras/Introjucer/Builds/MacOSX/Info.plist
index 681bea1cc2..a4a8e0c33e 100644
--- a/extras/Introjucer/Builds/MacOSX/Info.plist
+++ b/extras/Introjucer/Builds/MacOSX/Info.plist
@@ -16,9 +16,9 @@
CFBundleSignature
????
CFBundleShortVersionString
- 3.1.0
+ 3.1.1
CFBundleVersion
- 3.1.0
+ 3.1.1
NSHumanReadableCopyright
Raw Material Software Ltd.
NSHighResolutionCapable
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index d7ce65d068..1fd83cfcd9 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
@@ -1991,8 +1991,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
- "JUCE_APP_VERSION=3.1.0",
- "JUCE_APP_VERSION_HEX=0x30100", );
+ "JUCE_APP_VERSION=3.1.1",
+ "JUCE_APP_VERSION_HEX=0x30101", );
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)");
INFOPLIST_FILE = Info.plist;
@@ -2013,8 +2013,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
- "JUCE_APP_VERSION=3.1.0",
- "JUCE_APP_VERSION_HEX=0x30100", );
+ "JUCE_APP_VERSION=3.1.1",
+ "JUCE_APP_VERSION_HEX=0x30101", );
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)");
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index d4c6b74824..053d14e002 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
@@ -32,7 +32,7 @@
BufferSecurityCheck=""
DebugInformationFormat="4"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules"
- PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100"
+ PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101"
RuntimeLibrary="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -88,7 +88,7 @@
InlineFunctionExpansion="1"
StringPooling="true"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules"
- PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100"
+ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
diff --git a/extras/Introjucer/Builds/VisualStudio2005/resources.rc b/extras/Introjucer/Builds/VisualStudio2005/resources.rc
index 7eaab95552..651b9ee736 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/resources.rc
+++ b/extras/Introjucer/Builds/VisualStudio2005/resources.rc
@@ -7,7 +7,7 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,1,0,0
+FILEVERSION 3,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
- VALUE "FileVersion", "3.1.0\0"
+ VALUE "FileVersion", "3.1.1\0"
VALUE "ProductName", "The Introjucer\0"
- VALUE "ProductVersion", "3.1.0\0"
+ VALUE "ProductVersion", "3.1.1\0"
END
END
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 7ed0b2b0f4..66985fea1c 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
@@ -32,7 +32,7 @@
BufferSecurityCheck=""
DebugInformationFormat="4"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules"
- PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100"
+ PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101"
RuntimeLibrary="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -88,7 +88,7 @@
InlineFunctionExpansion="1"
StringPooling="true"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules"
- PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100"
+ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
diff --git a/extras/Introjucer/Builds/VisualStudio2008/resources.rc b/extras/Introjucer/Builds/VisualStudio2008/resources.rc
index 7eaab95552..651b9ee736 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/resources.rc
+++ b/extras/Introjucer/Builds/VisualStudio2008/resources.rc
@@ -7,7 +7,7 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,1,0,0
+FILEVERSION 3,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
- VALUE "FileVersion", "3.1.0\0"
+ VALUE "FileVersion", "3.1.1\0"
VALUE "ProductName", "The Introjucer\0"
- VALUE "ProductVersion", "3.1.0\0"
+ VALUE "ProductVersion", "3.1.1\0"
END
END
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 12c8015de5..b838b78e68 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
@@ -52,7 +52,7 @@
Disabled
EditAndContinue
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreadedDebug
true
@@ -93,7 +93,7 @@
Full
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreaded
true
diff --git a/extras/Introjucer/Builds/VisualStudio2010/resources.rc b/extras/Introjucer/Builds/VisualStudio2010/resources.rc
index 7eaab95552..651b9ee736 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/resources.rc
+++ b/extras/Introjucer/Builds/VisualStudio2010/resources.rc
@@ -7,7 +7,7 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,1,0,0
+FILEVERSION 3,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
- VALUE "FileVersion", "3.1.0\0"
+ VALUE "FileVersion", "3.1.1\0"
VALUE "ProductName", "The Introjucer\0"
- VALUE "ProductVersion", "3.1.0\0"
+ VALUE "ProductVersion", "3.1.1\0"
END
END
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index 544144e0a0..6d8862e093 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
@@ -58,7 +58,7 @@
Disabled
EditAndContinue
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreadedDebug
true
@@ -99,7 +99,7 @@
MinSpace
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreaded
true
diff --git a/extras/Introjucer/Builds/VisualStudio2012/resources.rc b/extras/Introjucer/Builds/VisualStudio2012/resources.rc
index 7eaab95552..651b9ee736 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/resources.rc
+++ b/extras/Introjucer/Builds/VisualStudio2012/resources.rc
@@ -7,7 +7,7 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,1,0,0
+FILEVERSION 3,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
- VALUE "FileVersion", "3.1.0\0"
+ VALUE "FileVersion", "3.1.1\0"
VALUE "ProductName", "The Introjucer\0"
- VALUE "ProductVersion", "3.1.0\0"
+ VALUE "ProductVersion", "3.1.1\0"
END
END
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
index a74be91c7b..fa41749e04 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
@@ -58,7 +58,7 @@
Disabled
EditAndContinue
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreadedDebug
true
@@ -99,7 +99,7 @@
MinSpace
..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)
MultiThreaded
true
diff --git a/extras/Introjucer/Builds/VisualStudio2013/resources.rc b/extras/Introjucer/Builds/VisualStudio2013/resources.rc
index 7eaab95552..651b9ee736 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/resources.rc
+++ b/extras/Introjucer/Builds/VisualStudio2013/resources.rc
@@ -7,7 +7,7 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,1,0,0
+FILEVERSION 3,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
- VALUE "FileVersion", "3.1.0\0"
+ VALUE "FileVersion", "3.1.1\0"
VALUE "ProductName", "The Introjucer\0"
- VALUE "ProductVersion", "3.1.0\0"
+ VALUE "ProductVersion", "3.1.1\0"
END
END
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index 36f9dc594c..3500b1ee87 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -1,7 +1,7 @@