From a9cec9e5e230dbd56d62ae6dd517ae10252125ae Mon Sep 17 00:00:00 2001 From: Tom Tanner Date: Fri, 20 Mar 2015 10:34:30 +0000 Subject: Fixed Scons build for existing bits. Changed pynedit.pro to fetch from 'standard' install location Changed saveas code to use organizer report rather than uibase - this way it's not dependant on the vagaries of the include path, and works the same as the rest of the organiser directory --- .hgignore | 68 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to '.hgignore') diff --git a/.hgignore b/.hgignore index 819b6f4d..f67264ff 100644 --- a/.hgignore +++ b/.hgignore @@ -1,46 +1,46 @@ syntax: glob scons_configure.py scons-ModOrganizer-* -#ModOrganizer-build-desktop* +ModOrganizer-build-desktop* outputd/* output/* build-ModOrganizer-* -#source/NCC/*/bin -#source/NCC/*/obj -#source/NCC/bin +source/NCC/*/bin +source/NCC/*/obj +source/NCC/bin *.orig -#source/plugins/proxyPython/build -#staging/* -#source - Copy/* -#ModOrganizer-build-* -#pdbs/* -#source/NCC/BossDummy.x/* -#*.ts -#staging_prepare/* -#staging_trans/* -#tools/python_zip/* -#Makefile -#html -#*.vcxproj -#*.pdb -#*.dll -#*.exp -#*.tlog +source/plugins/proxyPython/build +staging/* +source - Copy/* +ModOrganizer-build-* +pdbs/* +source/NCC/BossDummy.x/* +*.ts +staging_prepare/* +staging_trans/* +tools/python_zip/* +Makefile +html +*.vcxproj +*.pdb +*.dll +*.exp +*.tlog *.user -#*.obj -#*.suo -#*.sln -#*.log -#*.filters -#*.lib -#source/organizer/resources/contents/icons -#source/plugins/build-* -#*/GeneratedFiles/* -#translations/* +*.obj +*.suo +*.sln +*.log +*.filters +*.lib +source/organizer/resources/contents/icons +source/plugins/build-* +*/GeneratedFiles/* +translations/* source/LocalPaths.pri -#source/*/Win32/Debug/* -#source/plugins/*/Win32/Debug/* -#*~ +source/*/Win32/Debug/* +source/plugins/*/Win32/Debug/* +*~ syntax: regexp Makefile\.(Debug|Release) source/.*/debug/.* -- cgit v1.3.1