Changeset 2998

Timestamp:

10/16/14 00:02:55 (10 years ago)

Author:

Kana Sugimoto

Message:

---

r2993 | KanaSugimoto | 2014-10-15 20:32:13 +0900 (Wed, 15 Oct 2014) | 14 lines

New Development: No

JIRA Issue: No

Ready for Test: Yes/No

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: creating a test branch to merge from NRAO repository

---

r2994 | KanaSugimoto | 2014-10-15 20:51:59 +0900 (Wed, 15 Oct 2014) | 3 lines

Initialized merge tracking via "svnmerge" with revisions "1-31330" from
​https://svn.cv.nrao.edu/svn/casa/branches/personal/kana/test-merge-43-01/asap

---

r2995 | KanaSugimoto | 2014-10-15 21:15:27 +0900 (Wed, 15 Oct 2014) | 3 lines

Initialized merge tracking via "svnmerge" with revisions "1-31330" from
​https://svn.cv.nrao.edu/svn/casa/branches/personal/kana/test-merge-43-01/asap

---

r2996 | KanaSugimoto | 2014-10-15 21:24:23 +0900 (Wed, 15 Oct 2014) | 20 lines

Merged revisions 31331 via svnmerge from
​https://svn.cv.nrao.edu/svn/casa/branches/personal/kana/test-merge-43-01/asap

........

r31331 | kana.sugimoto | 2014-10-15 21:06:50 +0900 (Wed, 15 Oct 2014) | 14 lines

New Development: Yes/No

JIRA Issue: No/Yes List JIRA ticket.

Ready for Test: Yes/No

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: dummy commit

........

---

r2997 | KanaSugimoto | 2014-10-15 21:48:06 +0900 (Wed, 15 Oct 2014) | 17 lines

Merged revisions 31332-31334 via svnmerge from
​https://svn.cv.nrao.edu/svn/casa/branches/personal/kana/test-merge-43-01/asap

........

r31332 | kana.sugimoto | 2014-10-15 21:30:59 +0900 (Wed, 15 Oct 2014) | 1 line

A minor modification to a comment

........

r31333 | kana.sugimoto | 2014-10-15 21:36:19 +0900 (Wed, 15 Oct 2014) | 1 line

Removed a white line

........

r31334 | kana.sugimoto | 2014-10-15 21:39:32 +0900 (Wed, 15 Oct 2014) | 1 line

Put back year change

........

---

Location:

trunk

Files:

• . (modified) (2 props)
• CMakeLists.txt (modified) (1 diff)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 diff, 1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/FillerWrapper.h (modified) (1 prop)
• src/SConscript (modified) (1 prop)

trunk/CMakeLists.txt

@@ -1 @@
-###
+#####
 # CMakeLists.txt for ASAP module
-###
+#####
 
 # minimum requirement for cmake version

trunk/getsvnrev.sh

@@ -8 +8 @@
    exit 0;
 fi
-
 
 OUT=python/svninfo.txt