diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /win/tdelibs_global_win.h | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'win/tdelibs_global_win.h')
| -rw-r--r-- | win/tdelibs_global_win.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h index d8b4da08a..8e7d39d99 100644 --- a/win/tdelibs_global_win.h +++ b/win/tdelibs_global_win.h @@ -162,7 +162,7 @@ declared but not defined. The compiler was unable to find any destructors for th # pragma warning(disable: 4250) # pragma warning(disable: 4006) /*libxxx : warning LNK4006: - ".... already defined in kaction.obj; second definition ignored" */ + ".... already defined in tdeaction.obj; second definition ignored" */ /* disable C4100: unreferenced formal parameter */ # pragma warning(disable: 4100) |