Salome HOME
projects
/
samples
/
pylight.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e347b3e
)
Merge from V6_main 01/04/2013
V7_2_0b1
author
vsr
<vsr@opencascade.com>
Mon, 1 Apr 2013 13:29:45 +0000
(13:29 +0000)
committer
vsr
<vsr@opencascade.com>
Mon, 1 Apr 2013 13:29:45 +0000
(13:29 +0000)
18 files changed:
Makefile.am
patch
|
blob
|
history
adm_local/Makefile.am
patch
|
blob
|
history
adm_local/unix/Makefile.am
patch
|
blob
|
history
adm_local/unix/config_files/Makefile.am
patch
|
blob
|
history
adm_local/unix/config_files/check_PYLIGHT.m4
patch
|
blob
|
history
adm_local/unix/make_common_starter.am
patch
|
blob
|
history
bin/Makefile.am
patch
|
blob
|
history
build_configure
patch
|
blob
|
history
clean_configure
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
resources/LightApp.xml
patch
|
blob
|
history
resources/Makefile.am
patch
|
blob
|
history
resources/PYLIGHT_en.xml
patch
|
blob
|
history
resources/SalomeApp.xml.in
patch
|
blob
|
history
src/Makefile.am
patch
|
blob
|
history
src/PYLIGHTGUI/Makefile.am
patch
|
blob
|
history
src/PYLIGHTGUI/PYLIGHTGUI.py
patch
|
blob
|
history
src/PYLIGHTGUI/PYLIGHT_DataModel.py
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 92060dd070014fe6adb69277a1627a0f89b4789c..dbcd8e100d3f95706a57d22737b56863bbcbb2c3 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/adm_local/Makefile.am
b/adm_local/Makefile.am
index 98ec131042f0168c6ae35cf7e8adb048a6d289b5..0a5ecb0ff5217a71ff4dbe96dd1e793ab47931f2 100644
(file)
--- a/
adm_local/Makefile.am
+++ b/
adm_local/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/adm_local/unix/Makefile.am
b/adm_local/unix/Makefile.am
index 9957566fef6f9fedb3e87bdd9c731c71dfd80bdb..46d74db7fbfe0230b14c5871ea2fb5242e90217c 100644
(file)
--- a/
adm_local/unix/Makefile.am
+++ b/
adm_local/unix/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/adm_local/unix/config_files/Makefile.am
b/adm_local/unix/config_files/Makefile.am
index c56f0804f10304b19e52fc6e65a66757274c7355..9a8baacc6af7de31a7178c53826f45a156c46987 100644
(file)
--- a/
adm_local/unix/config_files/Makefile.am
+++ b/
adm_local/unix/config_files/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/adm_local/unix/config_files/check_PYLIGHT.m4
b/adm_local/unix/config_files/check_PYLIGHT.m4
index fbb32cda3e10b13d929d9cc46d07a4dae58dad5f..3fe3a03433a5277d1b1688faf10b23d5352b04c3 100755
(executable)
--- a/
adm_local/unix/config_files/check_PYLIGHT.m4
+++ b/
adm_local/unix/config_files/check_PYLIGHT.m4
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/adm_local/unix/make_common_starter.am
b/adm_local/unix/make_common_starter.am
index fe8e1e7525d3e19782a2e61a306d49cff1eda5e0..7c79e66f2bdfd09534da18928cc6d526faa35867 100644
(file)
--- a/
adm_local/unix/make_common_starter.am
+++ b/
adm_local/unix/make_common_starter.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/bin/Makefile.am
b/bin/Makefile.am
index 8a53a725941622f38ac8fd4400512ed8c90f8bd6..415eedf099579a59dc52d77fbb4cd6f0bcd40d7c 100644
(file)
--- a/
bin/Makefile.am
+++ b/
bin/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/build_configure
b/build_configure
index 727ec3111e7ed07897200ce6c5b0d2273d19f66c..8ce646762f8da303b5d62e14b918d8e3c1a17ee1 100755
(executable)
--- a/
build_configure
+++ b/
build_configure
@@
-1,5
+1,5
@@
#!/bin/bash
#!/bin/bash
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/clean_configure
b/clean_configure
index 28a9a403330269e3924d5b1c024c336014b4a95e..7e2aec096e843a386965b648b34d826f1766a050 100755
(executable)
--- a/
clean_configure
+++ b/
clean_configure
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/configure.ac
b/configure.ac
index d599a21836380a15c856715c5129e6c3b2ccf74c..c49ce1db655d31eb5e69d369522819bd3bf79994 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/resources/LightApp.xml
b/resources/LightApp.xml
index b16fa29e3300d2652cef2e9d3ff0820a12016df3..5568231df39c76b377c7f9bdbc48a99606a86958 100644
(file)
--- a/
resources/LightApp.xml
+++ b/
resources/LightApp.xml
@@
-1,5
+1,5
@@
<!--
<!--
- Copyright (C) 2009-201
2
OPEN CASCADE
+ Copyright (C) 2009-201
3
OPEN CASCADE
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git
a/resources/Makefile.am
b/resources/Makefile.am
index 6b152c1a4725042e462765a0655bf3628d479bef..0b3f8eff2f0bd02e51782c2486e92d3a6dc93a08 100644
(file)
--- a/
resources/Makefile.am
+++ b/
resources/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/resources/PYLIGHT_en.xml
b/resources/PYLIGHT_en.xml
index c91672c3725c627f27773085ddf15cd0412d003d..e242174446012ae53560d1f36545c8bf94ec02e7 100644
(file)
--- a/
resources/PYLIGHT_en.xml
+++ b/
resources/PYLIGHT_en.xml
@@
-1,6
+1,6
@@
<?xml version='1.0' encoding='us-ascii'?>
<!--
<?xml version='1.0' encoding='us-ascii'?>
<!--
- Copyright (C) 2009-201
2
OPEN CASCADE
+ Copyright (C) 2009-201
3
OPEN CASCADE
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git
a/resources/SalomeApp.xml.in
b/resources/SalomeApp.xml.in
index d635b8fdd886a8ebe7da97eb352c5044e68ea5f6..9d0b1735119b5088842a84cdea05b6efc8c475a9 100644
(file)
--- a/
resources/SalomeApp.xml.in
+++ b/
resources/SalomeApp.xml.in
@@
-1,5
+1,5
@@
<!--
<!--
- Copyright (C) 2009-201
2
OPEN CASCADE
+ Copyright (C) 2009-201
3
OPEN CASCADE
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 590ab5915b03ea363607a2dcef205b5bfb88fbdc..5e44820170f0ac72eb6825c282a08572c7fdcee8 100755
(executable)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/src/PYLIGHTGUI/Makefile.am
b/src/PYLIGHTGUI/Makefile.am
index 878ba306cd9ef6f5b7b6d6d4d8f2b3159acf10e6..6a5f8560c12f581204a44a8c395cb5f3e12e7e25 100755
(executable)
--- a/
src/PYLIGHTGUI/Makefile.am
+++ b/
src/PYLIGHTGUI/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/src/PYLIGHTGUI/PYLIGHTGUI.py
b/src/PYLIGHTGUI/PYLIGHTGUI.py
index f6405787e4f4b28db6a4e4294be0a3885141db53..3ce7f0a15b87d350ff4cbbcefb28688aff75c259 100644
(file)
--- a/
src/PYLIGHTGUI/PYLIGHTGUI.py
+++ b/
src/PYLIGHTGUI/PYLIGHTGUI.py
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
diff --git
a/src/PYLIGHTGUI/PYLIGHT_DataModel.py
b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
index 76db17ac555c0fc7547f175dc250b88bce2fed9b..bc884c4ec6ff46ffbcfcbcb5d55e77d58858e87a 100644
(file)
--- a/
src/PYLIGHTGUI/PYLIGHT_DataModel.py
+++ b/
src/PYLIGHTGUI/PYLIGHT_DataModel.py
@@
-1,4
+1,4
@@
-# Copyright (C) 2009-201
2
OPEN CASCADE
+# Copyright (C) 2009-201
3
OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public