summaryrefslogtreecommitdiff
path: root/src/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 15:00:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 15:00:35 +0100
commita00ebbc68438e84076c65e99d0e70403afb4407d (patch)
tree6ee2f535eeb6b592c740e117d1f8f8657d6bcce8 /src/wscript
parent665bc942f86bd7a8aeb2b38f3e9c2cb6662e6edc (diff)
parent606b3f759238aa6c0d12de064b301bf36b428220 (diff)
Merge master.
Diffstat (limited to 'src/wscript')
-rw-r--r--src/wscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wscript b/src/wscript
index f7f888acd..a4cf349f9 100644
--- a/src/wscript
+++ b/src/wscript
@@ -12,3 +12,8 @@ def pot(bld):
bld.recurse('lib')
bld.recurse('wx')
bld.recurse('tools')
+
+def pot_merge(bld):
+ bld.recurse('lib')
+ bld.recurse('wx')
+ bld.recurse('tools')