labofsahil/github-event-dataset-2012 huggingface dataset:
Fix an object corruption in <thread> instances in C-R-T

An incorrect assumption was made that DTHREAD can be extended.

To rectify this, I have introduced a per-thread GC-allocated THREAD
structure that contains thread-implementation-specific runtime details
about the thread.

This information should really go into the TEB, but that would
contaminate it with platform minutia.

Incidentally, this patch also keeps track of the thread name for further
use.
Add support for setting the thread name in C-R-T

This should work on OS X, Linux and FreeBSD.

On linux, prctl is used in addition to pthread methods because gdb shows
only that for some reason.
Merge pull request #339 from promovicz/crt-work-20121105

C-R-T fixes and debug enhancements
Split out database initialization into initialize.rb.
add more module for better site administration
Added test coverage for creation of duplicate objects. refs #661
Introduced RKBenchmark class for measuring performance of RestKit operations. closes #710
First functional cut at new Core Data cacheing implementation. Tests clean, needs polishing.
Added new logging component for Core Data cacheing subsystem. Fixed performance degradation in entity cache. Enabled RKManagedObjectCacheing callbacks to accelerate mapping, disabled processPendingChanges
Add delegate methods to RKObjectMappingOperationDelegate for tracking mappable content that is not
set due to an unchanged value. Update RKMapperTest to correctly validate mappings that do not result
in a value change (typically nil => nil). closes #72, fixes #634
Add actual OAuth implementations to the server, along with some basic test targets and some server-side specs to make sure things are wired up properly.
Merge in @theorm's additions to RKRequest, and re-vendor cocoa-oauth from our fork with @theorm's additions applied
Revert those calls to the nonexistent NSURL-originalPath method back to -path
Update tests for new ouath testing environment
Updated default Rake task to log a warning message is MongoDB is not available during suite execution. refs #714
Added RKPortCheck class for determining if a remote host/port is listening for TCP connections. refs #714
Updated RKOAuthClientTest to check for the availability of MongoDB and log a warning message if it is not available. This prevents broken test failures because MongoDB is not installed or running. refs #714
Merge branch 'feature/714-oauth' into development
Add RKBenchmark to the Support module instead of Testing. refs #710
Clean tests, added cached predicate usage for fetch request cache strategy. refs #739
Cacheing -> Caching
Completed documentation and testing for managed object cache overhaul. refs #635
Merge branch 'feature/635-accelerate-entity-cache' into development
Update Add to App Delegate image
remove itemlistmodel from the config since it was being replaced whenever a list was selected, also cleanup and simplify all of the code that was working with the itemlistmodel.
Typeahead auto submit form on select
Changed css position to use coordinates relative to "the element".
small update to allow for empty clip duration
removed "x" in flash messages
changes to the gradients
More features
Merge branch 'feature/conversion' of github.com:egloo/eglooframework into feature/conversion
kqeueu add, not compiled,because writing under debain...
corrigido tamanho no firefox
redone
merged
Removed superfluous log output.
More primitive shader wrappers, and a simpler implementation of loadShader
Retirei o index.html das pastas application e system, uma vez que ambas estão fora da pasta pública do servidor.
Prototype of roulettewheel selection added
Unified Session classnames, AutoLoader classpath caching
removed now unnecessary function advice

git-svn-id: https://svn.r-project.org/ESS/trunk@4695 0bbaf3bd-34e0-0310-bf65-c717079852d4
change gnuclient to emacsclient on Windows

git-svn-id: https://svn.r-project.org/ESS/trunk@5180 0bbaf3bd-34e0-0310-bf65-c717079852d4
source xmodmap
working signaling (signal route + model)
signals and votes stored in DB with checks of existence
default urllib2 handlers to []
fetch items from feed
Add "import opml file" link
[ins] add some restrictions to the usage of sonar data in ins
ex 3.5 1
ex 3.5 2
Add $trim for NSString
Revert "KYRA: Fix compilation for Eye of the Beholder and Lands of Lore"

This reverts commit 39760a870b2909ab78c58a007a03b16672b7644f.
Revert "KYRA: Require 'pitch' when copying between pages and buffers"

This reverts commit 8d84c3d032ea48171966eb096d1365513020a57c.
KYRA: Let the VQA decoder draw directly to the backend

As an alternative to using the Screen class's functions, we can let
the VQA decoder draw directly to the backend. This won't work if the
game uses "hi-res mode", but I don't think that's ever the case for
Malcolm's Revenge. I believe the KyraEngine_MR::playVQA() function
ensures that the screen is properly updated after the movie has
finished.

This almost limits the VQA rewrite to vqa.cpp and vqa.h. Whether it's
better this way than changing the Screen functions to take a 'pitch'
parameter...? I don't know. But it's an alternative.
[Module Manager]

-Begin implementing module manager
-Update mk.sh
fix concurrency issue + test
Apply few patches from darcs:

Pass date as get parameters to diagram
Evaluate diagram height from rows count
Rename html title and static files: nagios-analyzer -> nagios-view
Add template parameter to show_error.

This permits the error template to be easily overwridden
depending on context.
Bug 796224 - BT headset support for the Dialer
r=arcturus
layout.tpl updated for styling
adding more to the home page
PLF-3377: When making an upgrade between 3.5.x versions, all layouts and navigations  are resetted

Fix description:
	* Disables Upgrade-Navigation in upgrade among PLF 3.5.x versions
Site updated at 2012-12-27 19:35:01 UTC
MySQL is started by Travis on boot
adding vim-css
adding .js scripts
removing vim-puppet, I didnt really used it
Add a script to migrate files between storage engines

Summary: Quora requested this (moving to S3) but it's also clearly a good idea.

Test Plan:
Ran with various valid/invalid options to test options. Error/sanity checking seemed OK.

Migrated individual local files.

Migrated all my local files back and forth between engines several times.

Uploaded some new files.

Reviewers: btrahan, vrana

Reviewed By: vrana

CC: aran

Maniphest Tasks: T1950

Differential Revision: https://secure.phabricator.com/D3808
Minor, fix a missing z-index.
Add `--verbose` support to phd

Summary:
Support the `--verbose` flag added in D2795 in `phd`. See T1389.

Also simplify argument generation a little bit.

Test Plan: Ran "nice" daemon with debug,  daemon + verbose, daemon + no verbose.

Reviewers: vrana, jungejason, edward, aurelijus

Reviewed By: aurelijus

CC: aran

Maniphest Tasks: T1389

Differential Revision: https://secure.phabricator.com/D2797
Handle refreshing profile image with expired OAuth token

Summary:
If OAuth token is expired then refreshing profile image doesn't work.
This diffs solves it this way:

- Hide Refresh Profile Image button with expired token.
- Display Refresh Token with expired token.
- Update token after logging-in.

Test Plan:
Wait until token expires.
/settings/page/facebook/ - no Refresh Profile Image button.
Refresh Token.
Refresh Profile Image.

Reviewers: epriestley, jungejason

Reviewed By: epriestley

CC: michalburger1, aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2281
make differential use fluid width for code layout

Summary:
assume at least 360px for a given code pane. that's about when the comment box starts fighting back anyway. we'll use the yet-to-be-built one page render for the narrow viewport cases.

This address the cases as laid out in T2005. It fails the "MMMMM" case pretty horribly. However, if there is a space it works just fine and presumably folks are stretching out their windows on big glorious monitors at 160 characters wide or whatever.

Re-factored things just a tad but figure I'll take a nice big chunk of "renderer" to move forward T2009

Test Plan: looked at all sorts of funky diffs

Reviewers: epriestley

Reviewed By: epriestley

CC: chad, aran, Korvin

Maniphest Tasks: T2005

Differential Revision: https://secure.phabricator.com/D4083
Add a Delete link to Differential inline comment previews

Summary:
This lets you delete inlines from the preview at the bottom of
the page, instead of hunting for them through the diffs.

There is not yet a keyboard shortcut.

The mechanism for updating the inlines in the diffs is kind of a hack
and I'm sure I'm special-casing way too much, but at least it works.

Test Plan:
Load revision with many diffs. Create inlines all over the
place. Delete them all. Mwahaha.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T1433, T1431

Differential Revision: https://secure.phabricator.com/D3131
Improve speed of user feed

Test Plan: /p/x/feed/

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Maniphest Tasks: T1099

Differential Revision: https://secure.phabricator.com/D2176
Don't suggest nonexisting /A switch

Don't suggest nonexisting /A switch if second argument is not numerical
Revert "makefile.gcc: always link psapi dynamically", strip symbols

- This reverts commit b48c39b1caffe7eaac5d963eda5b4ec478b46562.
- Strip unnecessary symbols

This fixes "winrenice.exe is not a valid 32-bit application" error
dialog.
Stripping prevents huge executable sizes.
Use PROCESS_QUERY_INFORMATION to open process

Windows XP / Windows Server 2003 do not have the
PROCESS_QUERY_INFORMATION access right, and neither does the w32api of
the official MinGW (32-bit).
c2 314-350
Update lib/deploy-recipes/deploy.rb
fix for the infamous "invalid SSL_version specified at IO/Socket/SSL.pm line 308" error
mising files
missing files
Merge pull request #1 from knutov/master

fix for "invalid SSL_version specified at IO/Socket/SSL.pm line 308" error
init job resultset
add company
schema updates
that's it for now
fixed page resize issue
Modified Hello World again

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
Lab 08 re solution
Now it does ignore folders with 'tags' in the name.
Merge branch 'master' of github.com:jvortmann/dots
Added the map to make control left and right navigate between words.
Added function to convert hexadecimal numbers.
Ignoring sass cache by default.
fixing PATH for the coreutils
adding aliases to rails and bundle and making alias for git be autocompleted
adding alias to go to the current projects folder
adding aliases to add all and to amend a commmit.
Adding alias to projects folder.
Merge branch 'master' of github.com:jvortmann/dots
Updated RVM conf.
Adding alias for running rake on test environment.
Merge branch 'master' of https://github.com/jvortmann/dots

Conflicts:
	bash/bash_profile
	bash/conf/aliases
	bash/conf/functions
	bash/conf/path
Normal Deal Buy workflow

Inherits DealCreateTest class.
Validates inventory holding.
jboss cookbook
owner, group, mode for keystore
platforms with angles, 2 speeds for translating platforms, level 3
Fixed chunk hopping canSee() glitch
Fixing sample
Adding logging config
Adding support for html tidy
Partial fix for textarea maxlength in IE
make sure split and clipboard decorators work together
oh look, it's a finish portal
updated images
Merge branch 'master' of git@github.com:forkit/game-off-2012
System Log Monitor almost done. Modified log format to 24-hours' display.
Enlarged pin reader. More friendly prompts added to tool.signnew.py.
Add support for filtering by status.

e.g. use /workflows?status=KILLED to view only killed workflows. No
UI support for adding this flag, yet.
get rid of extra variable.
Merge pull request #1 from jcrobak/filter-by-status

Add support for filtering by status.
dette er en test
Merge branch 'master' of github.com:fpg44/fellesprosjekt
fikser slik at server snakker med xmlserializer og ikke xmlhelper
fjernet XMLHelper.jav
Renamed server-package
deleteevent
Merge branch 'master' of github.com:fpg44/fellesprosjekt
fixes to dashboard UI
delete hola
Added gems and installed rspec
Configured app to have the ability to send emails
Devise added
__flt_rounds is a public symbol (expands from the FLT_ROUNDS macro),
so include it in the public namespace on arm just as with
other architectures.

This corrects r236816.

Submitted by:	Jan Sieka
MFC after:	1 week


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237039 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Put parenthesis around sizeof args.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@238542 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Oops, return the newly allocated buffer to the queue, not the completed
buffer.

PR:	kern/168170


git-svn-id: svn+ssh://svn.freebsd.org/base/head@236994 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Bring this API in line with what the reference driver and Linux ath9k
was doing.

Obtained from:	Qualcomm Atheros, Linux ath9k


git-svn-id: svn+ssh://svn.freebsd.org/base/head@238838 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix ZFS boot with pre-features pools (version <= 28) broken in r236884

Reported by:	mav
MFC after:	1 month


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237001 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Changes which improve compilation if neither INET nor INET6 is defined.

MFC after: 3 days


git-svn-id: svn+ssh://svn.freebsd.org/base/head@238501 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
A problem with the NFSv4 server was reported by Andrew Leonard
to freebsd-fs@, where the setfacl of an NFSv4 acl would fail.
This was caused by the VOP_ACLCHECK() call for ZFS replying
EOPNOTSUPP. After discussion with rwatson@, it was determined
that a call to VOP_ACLCHECK() before doing VOP_SETACL() is not
required. This patch fixes the problem by deleting the
VOP_ACLCHECK() call.

Tested by:	Andrew Leonard (previous version)
MFC after:	1 week


git-svn-id: svn+ssh://svn.freebsd.org/base/head@235568 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix the previous commit to only copy the data we were asked to and not
twice as much.

Spotted by:	Taku YAMAMOTO


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237223 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix synchronization, and make changePeerNodeStatus() atomic.
Logging
Limit applies to total, not opennet.
Only if !isSeed, and remove duplication.
Parameterise PeerStatusTracker
Use PeerStatusTracker for backoff reasons too.
Minor optimisation.
Imports.
[OPENENGSB-3064] Rewrite Code in the .Net bridge
[OPENENGSB-2514] Converting a received exception from openEngSB to a C# exception
This is my first stab at this, hope it works.
The github page does not update - lets see if the video is the problem
Fork me!
Merge branch 'gh-pages' of github.com:futurecolors/fc.tape into gh-pages

Conflicts:
	index.html
updated with Fabric and shell
[jim] Redirect to index after creating new Food.
[jim] Add Spork.
[jim] Add editing capability for Food.
adding cache and logs folder
solved timus 1038
improve poms (formatting and dependency management section)
remove URL related stuff that should not be used anymore
remove IsolationLevel enum that is not used
remove ProxyInfo that is useless
remove useless jar code
remove useless CopyOnWriteRegistry
GTNPORTAL-2626 Missing translation in eXo Gatein while setting permission in portlet instances
GTNPORTAL-2596: Add user permission check to UIApplicationList.getApplications()
Sarted work on user's index sorting
Helge's compact! for some reason set the array to nil. Removed it.
Merge branch 'master' of https://github.com/gedankenstuecke/snpr
rollback to the original test
Add SSL in production
Finish sign-in and sign-out
Merge pull request #6 from ggrillone/sign-in-out

Sign in out
Rearranged packages
Rearranged packages (2)
Updated tuple class (database package) and dimension finder job
(distributed package)
Fix routes and add default content

Add default sizes
Add intro content
Add frame waiting content
Clean up the tests a bit
Test for duplicates in the results (as happens for C6H4 and C6H6 in A/Sym)
modified Fund class added @Entity annotation
C++を利用
Compress scripts/styles: 3.4-beta4-20766.
Handle relative urls when processing redirects. Introduce WP_Http::make_absolute_url(). Props dd32. fixes #20434
TinyMCE: don't throw fatal errors for malformed/invalid image caption shortcodes, props SergeyBiryukov, see #21145
thread safety for the disposables set
added a test to make sure the RAC macro gets expanded properly
Updating: adding support for fully indexed functional lists.
added a comment

some kind of comment for some reason
记录用户最后的更新版本 #127
updating core, trying to remove submodule
Merge branch 'master' of github.com:gnychis/android-wmon
Update Testttt/AppDelegate.m

sdf
Streamlined suites.
bugfix: erp -> pow
optimize case where both coordinates are identical
upgrade to 3.20
Remove duration limitation
In progress. Quotation test. Attempt to add translator to brahma infrastructure.
Switched from deb to rpm. Can't find a recently updated debian package repo.
Removed I2_ prefix for header guard #defines.
Site updated at 2012-06-29 03:13:44 UTC
Site updated at 2012-07-05 17:59:52 UTC
updated git tree to Theron 5.01.00 - rc0
Merge branch '05.01.00-rc0'
updated git tree to Theron 5.01.00
törty minits
Merge branch 'master' of https://github.com/guzno/WifiListWidget
knackwhore
new file:   1dmasks_n.pdf
	new file:   2dconvolution.tex
	new file:   bibliography.bib
	new file:   blockdiagram1.pdf
	new file:   blockdiagram2.pdf
	new file:   edge-detection-review-v10.tex
	new file:   edge-detection-review-v2.tex
	new file:   edge-detection-review-v3.tex
	new file:   edge-detection-review-v4.tex
	new file:   edge-detection-review-v5.tex
	new file:   edge-detection-review-v6.tex
	new file:   edge-detection-review-v7.tex
	new file:   edge-detection-review-v8.tex
	new file:   edge-detection-review-v9.tex
	new file:   edge-detection-review.tex
	new file:   examples/lena.png
	new file:   examples/lena_bw.png
	new file:   examples/lena_haralick.png
	new file:   examples/lena_marr-hildreth-log.png
	new file:   examples/lena_marr-hildreth.png
	new file:   examples/lena_prewitt.png
	new file:   examples/lena_roberts.png
	new file:   examples/lena_sobel.png
	new file:   examples/oranges.png
	new file:   examples/oranges_bw.png
	new file:   examples/oranges_haralick.png
	new file:   examples/oranges_marr-hildreth-log.png
	new file:   examples/oranges_marr-hildreth.png
	new file:   examples/oranges_prewitt.png
	new file:   examples/oranges_roberts.png
	new file:   examples/oranges_sobel.png
	new file:   gaussian_kernel.tex
	new file:   ipol.cls
	new file:   ipol_logo.png
	new file:   kernel_gaussian.pdf
	new file:   kernel_log.pdf
	new file:   kernels.pdf
	new file:   molino_crop_bw.jpg
	new file:   prewitt_n.pdf
	new file:   profile3d_gradient.pdf
	new file:   profile3d_image.pdf
	new file:   results/molino.jpg
	new file:   results/molino_bw.png
	new file:   results/molino_bw_zoom.png
	new file:   results/molino_haralick.png
	new file:   results/molino_haralick_zoom.png
	new file:   results/molino_marr-hildreth-log.png
	new file:   results/molino_marr-hildreth-log_zoom.png
	new file:   results/molino_marr-hildreth.png
	new file:   results/molino_marr-hildreth_zoom.png
	new file:   results/molino_prewitt.png
	new file:   results/molino_prewitt_zoom.png
	new file:   results/molino_roberts.png
	new file:   results/molino_roberts_zoom.png
	new file:   results/molino_sobel.png
	new file:   results/molino_sobel_zoom.png
	new file:   results/square127.haralick.png
	new file:   results/square127.marr-hildreth-log.png
	new file:   results/square127.marr-hildreth.png
	new file:   results/square127.png
	new file:   results/square127.prewitt.png
	new file:   results/square127.roberts.png
	new file:   results/square127.sobel.png
	new file:   results/square127_haralick.png
	new file:   results/square127_marr-hildreth-log.png
	new file:   results/square127_marr-hildreth.png
	new file:   results/square127_prewitt.png
	new file:   results/square127_roberts.png
	new file:   results/square127_sobel.png
	new file:   roberts_n.pdf
	new file:   sobel_n.pdf
	new file:   test_fded.tex
	new file:   test_haralick.tex
	new file:   test_mh.tex
	new file:   thresholded_image_1.png
	new file:   thresholded_image_2.png
	new file:   thresholded_image_3.png
Signed-off-by: HalFtaN <half.a.tan@gmail.com>
保存临时数据功能
Signed-off-by: HalFtaN <half.a.tan@gmail.com>
Signed-off-by: HalFtaN <half.a.tan@gmail.com>
swapping 2 lines to allow response callbacks to add new urls to the request queue. Otherwise such behavior would block the whole queue (if max parallel requests were reached) and ParallelCurl would stay in waitForOutstandingRequestsToDropBelow forever
Reusing curl handlers by pooling them. This enhances performance if a large number of requests are done on the same hosts because connections to hosts are not closed but rather reused (if they support keep-alive).
Rewrite the login ui to use bootstrap form
Fixes on Footer Layout
Change init.zsh path
Updated the README
Readded the build status
Wrong link to build status [ci skip]
The walrus is gone. Eh, I mean: added Gemfile.lock
Made the negative test cases work.
The extract matcher now handles nil gracefully
Build on all the rubies!
Support for symbols in variables hash passed to expand 
in order to support the Ruby 1.9 hash syntax.

The keys in the variables hash are converted 
to strings. Ruby 1.9 hashes are ordered, which 
means that the last key in a collision is used 
in the template expansion.

The behavior under Ruby 1.8 is undefined, but it
seems like symbols take precedence over strings.
Merge pull request #3 from peterhellberg/master

Support for symbols in hash passed to expand.
in expand: test for :map instead of :[]
Bump version
forgot to add a thank-you
Updated the uri-template-tests and fixed an encoding bug
Fixed yard markup error
Fixed a typo
The encoding with escape_utils now works correctly
FIX: variables were incorrectly decoded
Pimped the helper classes
Significantly improved the Colon template type. Next target: sinatra compat
Colon spec now has a real copyright YAY!
Remove jQuery / script loads
oops, uploaded .DS_Store
Fallback to vim temp folder for undo files
Turn off tmux pane-switch repeating
Now all data that is uploaded is converted into a Buffer before being handed over to DropBox.
Merge branch 'master' of https://github.com/hci-au-dk/FluidWebFS
撤消qicb的test提交。
Merge branch 'Develop'
Merge pull request #2 from katway/Develop

Develop
Merge remote-tracking branch 'hefangli/master' into Develop

Conflicts:
	Application/Program.cs
	Application/frmMain.cs
Merge pull request #6 from hefangli/master

所有内容提交
修正性提交
Merge branch 'Develop' of https://github.com/katway/PatrolCheck into Develop

Conflicts:
	Application/Program.cs.orig
	Application/frmMain.Designer.cs
	Application/frmMain.cs
	Application/frmMain.cs.orig
忽略文件中增加.orig
修正语法
Merge remote-tracking branch 'hefangli/master' into Develop

Conflicts:
	Application/WorkStation.csproj
	Application/frmMain.Designer.cs
	Application/frmMain.cs
修正性提交
Merge remote-tracking branch 'qicb/Develop' into Develop

Conflicts:
	Application/WorkStation.csproj
	Application/WorkStation.csproj.orig
	Application/frmMain.Designer.cs
	Application/frmMain.cs
	Application/frmMain.cs.orig
	Application/frmMain.resx
修正.csproj文件
修正frmMain.Deigner.cs文件缺失部分
基础核心功能初步完成

1.任务管理，基础信息，卡片管理
使用反射调用窗体
Merge remote-tracking branch 'hefangli/master' into Mdi

Conflicts:
	Application/WorkStation.csproj
	Application/frmMain.Designer.cs
	Application/frmMain.cs
	Application/frmMain.resx
Merge remote-tracking branch 'hefangli/master' into Mdi

Conflicts:
	Application/frmMain.Designer.cs
调整窗体名称和主窗体对应菜单项名称

1.调整窗体名称和主窗体对应菜单项名称
2.使用反射调用相应窗体
3.其它杂项
Merge branch 'Develop' of https://github.com/hefangli/PatrolCheck
functionality improvements and style editing changes
sqlite version 1.3.6
syntax changes
like 'reset_password' much more than 'password_rest'
Debug urlrewrite for multicompany
Debug urlrewrite for multicompany
Modify for entity in url
PostBuilderにLinkタイプを追加
x86_64 turned to x64
このページの対応リポジトリについて追記した
Add repos url
change gemfile sqlite3ruby
Add AccoutViewController to add/edit/remove Google Account
Various commits

- Add "Remove Account" function for AccountViewController
- Add "Mark All As Read" function for DetailViewController
- Fix minor bugs with non-trimming summary
fix slide name
test
Merge branch 'master' of https://github.com/holykss/RushAndCrash

Conflicts:
	Assets/Scripts/Minion.cs
OpenPGP-pkcs15init: Add more checks in key generation.

Check for key ID. Set default key.
Check for result of key generation from driver.
another minor stuff
Run bootstrap, DB migrations and the dev server through Ant as a nod to cross-platform support.
Prefixed all swallow urls by /swallow (to make it easier to integrate swallow inside a development server like Express, Connect, or a custom node server).
Added logging functionality to generate a build log on test run
Merge pull request #1 from nareshdeekonda/BuildLog

Added logging functionality to generate a build log on test run
Merge pull request #1 from nareshdeekonda/master

Added logging functionality to generate a build log on test run
Extracted dependency checks to Gitnesse::Dependencies
Commit info using attr_accessor rather than instance variable
Extracted git config reading code into Gitnesse::GitConfig.read
Update social.png file path.
As-built for the morning of 30 August, 2012.
(Compacted version of same.)
Properly write format name.

ePub, EPub ... -> EPUB

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/l10n-kde4/de@1300186 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
SVN_SILENT made messages (.po file, second try)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/l10n-kde4/de@1300224 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
SVN_SILENT made messages (.po file, second try)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/l10n-kde4/de@1291369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Setup LocationHandler and GDataHandler

Calculating Min Time/Distance Intervals to next location update
Added git ignore file
added both settings files and db file
Added visuals for connectivity demo
Log only if VERBOSE flag is defined
fix some bugs of convert-to-cashbook2.hs
fix syntax errors and wrong use of functions in sum.hs and IgrepCashbook2.hs
around search
Looks like we can't use every willy-nilly.
Through trial and error, I find this is the way.

To avoid crashy cycles on startup.
bumping ecoadapters to 0.4.2
prepping for 0.2.5
[maven-release-plugin] prepare release tag-0.2.5
[maven-release-plugin] prepare for next development iteration
prep for 0.1.19
Minor edits to all chapters.
bunk in the readme
Fixed clob out. maybe.
Created text file for users to fill in API key/secret
inverse message order
Optimizing for Isotope 1.3
Build version advanced to 3480-48
Use setProperty() instead of put() when using Properties
Clean code
Set eventsListenersList as final
Set fields as final
Add final to fields
avoid boxing
clean code
remove tools project and moved to a new repository (rest-doclet)
add Jdoc
add .project and .classpath
point to rest-doclet project
change check sum validation to warn instead of fail
Build version advanced to 3480-50
Build version advanced to 3480-52
change plugins' versions
Added new folder for ict project showcase
Brand name link to index
Drop open4 refs
Move package/release stuff to Thor
KOKU-1281: Vanhempien mahdollisuus vastata lähetettyyn viestiin

* Marking messages non-repliable if they are not in the Inbox folder
ini + ping added
Merge pull request #14 from jackzpj/master

讯飞识别问题
Signed-off-by: jackzpj <jackzpj@gmail.com>
Helper methods for dancing links solution

* DLMatrixConstructor takes a SudokuBlock as input and creates a
constraint matrix. By default this is written to output, but eventually
it will be used in the DL solution.

* DLNode is a node class with up, down, left and right links, as well as
cover and uncover methods.

* matrix.csv is an example constraint matrix.
Remove trailing spaces and start emacs server in the end.
Fix w3m buffer disambiguation bug.
Loading libraries using try-idle-require was not efficient enough. It loads too many libraries. Removed it.
Now loading local init script. After that it will rebind file-files and load desktop files.
Does not use C-h as backspace. And make alt key as meta key. Useful on Mac.
Ansi color for eshell requires eshell.
Eshell can prompt password.
Add jabber and EasyPG.
Need to find a better way to detect system coding.
ENH do not fail the test reslying on numpy div 0 warnings if those are not spit out by numpy in general
Merge pull request #928 from yarikoptic/master

ENH do not fail the test reslying on numpy div 0 warnings if those are not spit out by numpy in general
Update nesta-plugin-gallery/lib/nesta-plugin-gallery/init.rb

have to do this to get my nesta working with this plug-in.
Adding vimrc, command to automatically update Vundle for Vim as part of bootstrap
Release Version 0.0.4
Bump Version to 0.0.5-dev
Simplifying index page for downloads. Changing sidebar Installer => Installers (plural)
Moving content/team to /team/ subfolder
Add Ideas file
phpinfo
requests.php
removed extraneous "set number" from vimrc
Uses Tilt to treat .html files as Ruby templates
Update PyPy port based on sthen's comments.
Fix gcrypt deprecation and update to latest OpenVAS v5 versions.
login works, added some extra pages with alert messages for the benefit of the user
moved documentation to Sphinx
Placeholder graphics for cavalry.
makefile - pb nom fichier
Add missing CMakeLists.txt. Fixes #25

See https://github.com/Slicer/SkullStripper/commit/d97c201f4a1e0f241f86994e8fed16d0df354bfd
Merge branch '25-skullstripper-add-missing-cmakelists'

* 25-skullstripper-add-missing-cmakelists:
  Add missing CMakeLists.txt. Fixes #25
Adding FacetedVisualizer extension
updated revision to reflect modifications in packaging
Merge pull request #27 from millerjv/26-faceted-visualizer-add

Adding FacetedVisualizer extension
Add FacetedVisualizer extension. See issue #26
Merge branch '26-add-FacetedVisualizer'. Fixes #26

* 26-add-FacetedVisualizer:
  Add FacetedVisualizer extension. See issue #26
Add Readme file describing what is the ExtensionsIndex. See issue #24
Merge branch '24-ExtensionIndex-add-readme-file'

* 24-ExtensionIndex-add-readme-file:
  Add Readme file describing what is the ExtensionsIndex. See issue #24
Specify the full name of the tracker to prevent confusion. See #24
In contribution steps, specify how extension could be tested
Explicitly set EXTENSION_* variables. See issue #30
Merge branch '30-skullstripper-fix-extension-build-and-update-cmakelists'

* 30-skullstripper-fix-extension-build-and-update-cmakelists:
  Explicitly set EXTENSION_* variables. See issue #30
Update CMakeLists.txt and fix unix build issues. See issue #32
Update CMakeLists to be consistent with Slicer style. See issue #31
Merge branch '31-carma-update-cmakelist'

* 31-carma-update-cmakelist:
  Update CMakeLists to be consistent with Slicer style. See issue #31
Merge branch '32-FacetedVisualizer-update-cmakelist-and-fix-build-issue'

* 32-FacetedVisualizer-update-cmakelist-and-fix-build-issue:
  Update CMakeLists.txt and fix unix build issues. See issue #32
ENH: Add Reporting extension

See issue #33
Fix "Slicer requirements" link

Thanks to Andras for reporting the problem.

See issue #24
Merge branch '24-ExtensionIndex-add-readme-file'

* 24-ExtensionIndex-add-readme-file:
  Fix "Slicer requirements" link
  In contribution steps, specify how extension could be tested
  Specify the full name of the tracker to prevent confusion. See #24
Compatibility improvment (in the future)
Cocoa skeletton
docs
Added planeProj
Tidied up
Fixed transforms; using line/plane intersection
Fixed rpgTransform
Removing planet deps
planet2 and working tests
change library to do the work and possibly find a default
use new library function
clarify warning message
use nexus-cli 1.0.1
support 2.0.0 version of nexus cli gem
Merge pull request #14 from RiotGames/repositories_data_bag

Try to find a default entry in the *_repositories data bags
bump version
makes word pictures
Modified:oauth
Arrange the doc and finish example.
Fixed typo: or -> of.
wine: upgraded to 1.5.9
Copy edited up to last liferay sync section.
Activate number-headers dependency for dist targets.
Merge pull request #190 from jhinkey/number-headers

Activate number-headers dependency for dist targets.
Manage Teams was moved.
updated image captions for liferay sync images, ran numbering tool, updated summary to include liferay sync
Merge branch 'master' into liferaysync
Finished editing Jesse's sync section. Noticed broken image in Wed DAV section.
Finished editing Jesse's sync section. Noticed broken image in WebDAV section.
Merge branch 'liferaysync' of github.com:sezovd/liferay-docs into liferaysync
Merge pull request #192 from sezovd/liferaysync

Liferaysync
Merge pull request #191 from jrao/liferay-sync-guide

updated image captions for liferay sync images
add .gitignore
add quiz.jin
Remove OS X hidden files.
Adding submodule folders.
modified form.html
Merge branch 'master' of https://github.com/jlombardo/BeerAdvice
Order display
Order UUID generator
Added documentation and started implementing player test
minor change to auth
fixed pom.xml for new stand-alone hotdeploy repo
Added open-search paging info in a desperate attempt to get GReader to parse the damned thing.
Ch4 ex2
orc: update to 0.4.16

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
nodejs: update to 0.6.20

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
systemd.bbclass: remove unused code

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
systemd.bbclass: extract SYSTEMD_SERVICE properly

To set service files the following syntax is allowed:

SYSTEMD_SERVICE = <service_file>
or
SYSTEMD_SERVICE_{<systemd_package_name>} = <service_file>

A function get_package_var was introduced to handle all use-cases [1]
properly.

Build tested / buildhistory checks

[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-May/039870.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
systemd.bbclass: do not warn for systemd files are in ${PN}

Since we have our own layer there is no need to separate out systemd packages

Signed-off-by: Eric Bénard <eric@eukrea.com>
systemd.bbclass: introduce SYSTEMD_AUTO_ENABLE variable

Currently all services introduced are enabled and started at installation. By
setting SYSTEMD_AUTO_ENABLE = "disable" the default behaviour can be
overridden.

Signed-off-by: Eric Bénard <eric@eukrea.com>
sox: add 14.4.0

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
libxaw: Fix libxaw-dev to not depends on non-existent libxaw package

The libxaw recipe generate a binary package for each soname of libxaw
(currently libxaw6-6 and libxaw-7-7) but no libxaw so libxaw-dev
cannot depends on it.

Reported-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Forgot to upload
Changed typedefs to use <stdint.h> definitions
Where'd that garbage file come from?
Merge branch 'master' of git://github.com/johnarke/C-Utilities
restructure headers
Document the Allocate/AllocateArray macros
Merge pull request #3 from cmr/documentation

Documentation
changing varNames

Added support for changing the names of variables within a model.
Added method and type listener registration
Fix individual post pages. Fix password file read.
more foo bar
Initial commit of SCalendar
Refresh the html when skipping/finishing the final set
Stop two rest timers counting down at the same time
Add some keyboard shortcuts
Reps that are written as a timer will start the timer
Refactor the timer code a little
Some max tweaks
version Alpha 1
back to railscasts theme and adjusting semicolon shortcut
Main.cs working now
add readme
add homepage
error in date_format. was in options but meta in yml
corregido bug en simplepie
fix link edit
only zoom the canvas if nothing focused

(like input fields for example)
instucicion switch to custume
Add gemfile
vim cruft
WIP: Lots of tests failing, but now they are real fails rather than errors using Linalg when we have moved to GSL
Add travis power
Merge branch 'new_api' of github.com:josephwilk/rsemantic into new_api
TextureCanvas::max_size=0
add multilingual search form to sidebar
Revert "[controlgroup css] Turn off shadow for children, but not if ui-focus is present"

This reverts commit 710c251c2b8506b175ba9bb82980ecbf61f37d9a.

St00pid IE ...
Grid: Fixes #4835 - grid with more than 2 columns and multiple rows has incorrect css
Update README.md

Keepalive no longer needed, replaced by ping
saving for parallel runs on nlp machine
- inst_suseconfig removed, replaced by warning after new kernel
  installation
- 2.23.0
Run negative tests as well.
Pass all but three negative tests.

These three incorrectly parse without errors:
/vars/:var {keys:1} {+keys:1}
Fixes #1386 (OpenID buttons not displayed properly when using foreign languages)
readme
extended mongo utils
new readme based on actually doing demo..
nouvelle map, écrit fin à la fin de la map
timeout override for admins
sub command対応(仮)

- やっつけなのでGetopt::Compat::WithCmd相当まで拡充する
init
Merge https://github.com/kaoshijuan/Angrybots
samll tests that I forgot to commit from last time
lik ratio function seems to be working, will run more tests tomorrow, that will be the last of them, then the bakeoff will begin
moved delete button around
Optimized communication between the processes.
Added memory-info method to make it easier to debug.
Reuse proxy-objects instead of spawning new ones (and corrupting memory).
Reduced sleep when waiting - it was way to large which gave way too big sleep-overhead.
Begin looking for new routes after sorting by highest overflow, trying to modify bfs to use least overflowed route
Added test server URL
Saves on memory use the String.intern()
Notifies user if form is not found on the server
Some internationalistion stuff
Restore selected index on refresh
Updatint the model build
Starting Point!
Merge branch 'master' of github.com:kburnell/KO_Your_MVC
fixes a bug in skel recipe, now chowns() file
adds redhat support to mysql recipe
fixes bug when python is not found.
updates changelog, bumps version
Removed "using namespace" statements from .h files
Logger rework

--Stores client IP and port
--Provided functionality to not have to use pointers
Modified server to use new logger
Modified main to use new logger
Catch bad_alloc that "new" might throw
Switching to v8 3.9.9
Edits from autoreconf -ivf
Fixed non-C++11 compliant code
Style change. Limiting scope of variable
Ignore valgrind errors from libgcrypt
Fixed tests that won't compile
Removed FileHandlerImpl class
Removed ServerImpl class
Removed ScriptHandlerImpl class
Removed LoggerImpl class
Switched to 3.12.19 of V8
Switched to using V8 shared library

See README on how to accomplish this properly
Fix compiler errors
address review comments for client search and minor updates to document search api
Bumped version, added .gitignore
Added Users, Courses, and Teams methods
Bumped gem version to 0.0.3
Removed rdoc cruft from Rakefile
more style housekeeping

fixed tables and blockquote styling
Change gem source to http://ruby.taobao.org/
Adds a sum function for events/errors
Controller tests using embedded dummy Rails app.
Documentation mea culpa
Qsys出力ファイルもgit管理下に追加する
Remove PHP files
Change table display
Clean up
New progress bar with books!
Design changes
Added MIT License to README. Hack a way
Installed Origami
first model with Mongoid
# fix
# fixes
Create cutter.c
First commit
Added DZhu's files
updated ActionCommand and GameHud
commit na glavnata granka
stats:styling
Split the code up into some modules
Add new cmds
added new problems, manifesto, colophon, and disqus
fix bug #9 Default values
fix: TRY & THROW used an old offset, w/o.r.t R4.
push
Merge branch 'master' of https://github.com/kurorido/ZKTouch-Web
fixed test error
ERG
answers
Converted RPKM from BED to subroutine.
Added close file statements to subroutines -> check if error causing
Simplified creation of mouse chromosome array -> check if error causing
Directional light support

Right now using the colors alpha channel to store it. Maybe a bit odd,
but seems efficient...
add web cluster figure
Initial commit of version 1.0.0.
added BotoWrap
OhtuVarasto vienti
使用物品和魔法的操作方式修改
战斗中选择菜单和技能
战斗操作方式修改
Minor bugfix
Bug fix on scrolling. Was not displaying correct item of the playing station on the list.
Added favorite button to each list item.
db:

Updated schema and models with new Hazard Map schema.

The new schema only consists of one table, where all location values
are kept in pickled numpy arrays.
GuestSessionImplTasks/Update Additions: Get rid of the env var hacks, use guest properties to detect guest OS + installation paths, revamped code. 

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42923 cfe28804-0f27-0410-a406-dd0f0b0b656f
GuestSessionImplTasks/Update Additions: Get rid of the env var hacks, use guest properties to detect guest OS + installation paths, revamped code. 

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42924 cfe28804-0f27-0410-a406-dd0f0b0b656f
FE/Qt: 6283: Restore + snapshot for current state + cancel != lost current state.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42925 cfe28804-0f27-0410-a406-dd0f0b0b656f
Build fix.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42926 cfe28804-0f27-0410-a406-dd0f0b0b656f
Additions/common/VBoxService: minor bug fix.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42927 cfe28804-0f27-0410-a406-dd0f0b0b656f
Main/GuestControl: forgot to actually start the mktemp process.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42928 cfe28804-0f27-0410-a406-dd0f0b0b656f
FE/VBoxManage/GuestControl: add mktemp.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42929 cfe28804-0f27-0410-a406-dd0f0b0b656f
Main: fixed recently introduced typo which caused to show garbage in the error message if a VM cannot be found


git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42930 cfe28804-0f27-0410-a406-dd0f0b0b656f
Please, leave my comment style alone.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42931 cfe28804-0f27-0410-a406-dd0f0b0b656f
Network/e1000: Tx delay timer, ITR fix, more stats (#4807)

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42932 cfe28804-0f27-0410-a406-dd0f0b0b656f
changelog


git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42933 cfe28804-0f27-0410-a406-dd0f0b0b656f
32-bit build fix

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42934 cfe28804-0f27-0410-a406-dd0f0b0b656f
Forgotten logging.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42935 cfe28804-0f27-0410-a406-dd0f0b0b656f
build fix


git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42936 cfe28804-0f27-0410-a406-dd0f0b0b656f
GuestSessionImplTasks/Update Additions: More error checks, logging enhancements, disabled using  VBoxCertUtil (needs investigation first).

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42937 cfe28804-0f27-0410-a406-dd0f0b0b656f
Typos.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42938 cfe28804-0f27-0410-a406-dd0f0b0b656f
VBoxCertUtil: Added version information to file properties, use the GA icon.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42939 cfe28804-0f27-0410-a406-dd0f0b0b656f
Installer/darwin: Cleaned out the package maker bits.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42940 cfe28804-0f27-0410-a406-dd0f0b0b656f
Installer/darwin: Forgot Bundle.kmk reference. Removed unncessary tool names from the Makefile.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42941 cfe28804-0f27-0410-a406-dd0f0b0b656f
Installer/darwin: Forgot to remove submakefile.

git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@42942 cfe28804-0f27-0410-a406-dd0f0b0b656f
Add Bundler's gem helpers for each gemspec
Update for:: V1-D-07704
use t='s' instead of inlineString for empty cells.
Linking artilces list to the blog page.
Edited workers controller
create parseSyntax
bugfix
modify parser
impl tycheck
merge joseph
Add TermSyntax, OpSyntax, Change Expr.java
disable scrollbars
add proxy-toggle keybinding
fix a minor bug for running irstlm.
moving and ControlHandler -class
Clean up.
Update README with webkit-gtk package and add a ROADMAP file.
add official g+ badge as the other one broke
add seperator between passes
Merge branch 'master' of github.com:lihanli/health_check
flyingf4: updated file headers from discoveryf4 to flyingf4
i think gps is done
Merge branch 'master' of github.com:linuxlewis/bushwhack
Arange more place for introduction2 in AdapterSetup Screen
tian jia zhao xiang gong neng
Removed logger statement.
Updated the references to caniuse.com since we're not using browser
versions directly anymore.
Add fugitive submodule
Add bufExplorer plugin
Set bufExplorer mapping
Update HelpTags
Added Default colors
Added ColorScheme Settings
BZ876465  Embedding scalable app (php) with jenkins fails to create a new builder

- adjusting the default to match the hosted configuration.
add backtraces to error conditions in agent
give a different error if a node isn't returned by mcollective
Merge pull request #972 from calfonso/master

Merged by openshift-bot
rewording
chapter 17 draft completed
Merge remote-tracking branch 'origin/draft/chapter17' into draft/chapter17

Conflicts:
	chapter17.md
first steps writing the twisted protocol. however, twisted lacks support for unix socket + seqpacket
added rspec and a working test for article model
Scaffolds will now share the same layout file

The  scaffolds' layout is now in the layouts directory.
Explanations done
first commit. copied money-bucket repo
commented out require cgi
Shuffling words in chaining pending section
Site updated at 2012-07-13 19:43:46 UTC
GET /shipments
Capslock with double click and Shift with one click on shift button
Clean up name parsing logic
porting over new filtercollection (diff events on refresh bugfix)
=2012.04.19
Dialog,DialogManager pure implementation-NOT TESTED.
Makefile fixation: include dirs addition for Dialog and DialogManager,
that they can use glibmm::ustring.
Simple change of DialogManager::sendto interface. Added argument for
message to send.
Mongoid configuration to support heroku
use Ruby 1.9.3
subview added: add shop
Fixed description for server2.js
Merge pull request #281 from thanpolas/server2.js

Fixed description for server2.js
beany/qszhuan | #1690: xform django error about language in select field
refs #5103. For windows DataHandling goes to plugins
Refs #5453. Name changes and adding another output workspace.
refs #5553 trying to revert changes which cause tests to fail
Set run_start property using most recent packet's time

When setting the initial value for the run_start property, use the time
from the most recently received packet instead of the current system
time.  (Doesn't matter too much when using actual live data, but when
replaying old data it makes a lot more sense.)

Refs #6235
refs #5919 Change for LoadNexus to take full path to file
Re #6287. Windows line endings causing linux developer woes.
Fix cursor bug in script interpreter. Refs #5215

The cursor was being moved to the end when anything was typed rather
than checking if it was already on the last line.
Fix algorithm dialogs crashes from Python. Refs #5217

The function calls weren't routed properly so they didn't get called
on the correct thread.
Addded LICENSE and basic installation instructions
Script tag now points to github
Add DataManager and the DB
Styling the gravatars a bit better
added my theme.
added screenshot of theme.
Adds missing ignore dirty.
Merge pull request #84 from kylewest/kylewest-theme

kylewest zsh theme with vi insert/command mode indicator
Merge pull request #82 from markcornick/fix_gitignore

Fix excludes file in gitconfig
Merge pull request #85 from NilsHaldenwang/master

Adds missing ignore = dirty to .gitmodules
Upgraded plugins
Merge remote-tracking branch 'skwp/master'

* skwp/master:
  Upgraded plugins
  Adds missing ignore dirty.
  added screenshot of theme.
  added my theme.

Conflicts:
	.gitmodules
	vim/bundle/timcharper-textile
fixed rrd_create parameter structure. Parameter values still wrong
merkattu virhe
korjattu konflikti