diff options
| author | Rat <none@none> | 2010-06-07 00:17:11 +0200 |
|---|---|---|
| committer | Rat <none@none> | 2010-06-07 00:17:11 +0200 |
| commit | 51bdf17974fc6bd90f0b22e760f1def184aed49b (patch) | |
| tree | 2ddbfd3fb82a6ba0116664b785c7737e6f2eb1c6 | |
| parent | f8627de68396e1569831498b31d65393f005bbff (diff) | |
| parent | 81610ac190525166d44a3169d157fe23e80da1fd (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | opt/cleanup/tab2spaces.sh (renamed from contrib/cleanup/tab2spaces.sh) | 0 | ||||
| -rw-r--r-- | opt/cleanup/whitespace.sh (renamed from contrib/cleanup/whitespace.sh) | 0 | ||||
| -rw-r--r-- | opt/conf_merge/README (renamed from contrib/conf_merge/README) | 0 | ||||
| -rw-r--r-- | opt/conf_merge/index.php (renamed from contrib/conf_merge/index.php) | 0 | ||||
| -rw-r--r-- | opt/conf_merge/merge.php (renamed from contrib/conf_merge/merge.php) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/contrib/cleanup/tab2spaces.sh b/opt/cleanup/tab2spaces.sh index 1022be7905c..1022be7905c 100644 --- a/contrib/cleanup/tab2spaces.sh +++ b/opt/cleanup/tab2spaces.sh diff --git a/contrib/cleanup/whitespace.sh b/opt/cleanup/whitespace.sh index a351e25359b..a351e25359b 100644 --- a/contrib/cleanup/whitespace.sh +++ b/opt/cleanup/whitespace.sh diff --git a/contrib/conf_merge/README b/opt/conf_merge/README index 3d027b7ad42..3d027b7ad42 100644 --- a/contrib/conf_merge/README +++ b/opt/conf_merge/README diff --git a/contrib/conf_merge/index.php b/opt/conf_merge/index.php index 537937caf64..537937caf64 100644 --- a/contrib/conf_merge/index.php +++ b/opt/conf_merge/index.php diff --git a/contrib/conf_merge/merge.php b/opt/conf_merge/merge.php index 6d8bedbaa08..6d8bedbaa08 100644 --- a/contrib/conf_merge/merge.php +++ b/opt/conf_merge/merge.php |