labofsahil/github-event-dataset-2012 huggingface dataset:
Update to Far 3.0.2764 + temporary solution to issue #7.
add back button for userlist
added postgres table schema
Merge pull request #2 from willwo13/sim0n

added postgres table schema
Merge pull request #1291 from sipa/canonames

Use getnameinfo() to get canonical IPv6 addresses
-onlynet instead of -blocknet
Allow binding to the any address, and report failure
Do not listen on blocked networks
Fixed the order of frames in stack traces.
Added "-v" cmd key to generate verbose output: "VERBOSE" macro (default false) and verbose code blocks.

Moved types and helpers to a separate module.
Add comment colors for news.ycombinator.com
Hide non-English languages on batoto.net
switched to nouveau
different fingerprint for bool_equal and use permutations if necessary
stabilizer_cosets, coset_factor and gens come back as permutations

af=True will send them back in array form
Don't suspect segfault on empty line.
Remove under attack at the same time as checking.
s/ion3/notion/
Fix CSS import of Rock Salt font
tapestry samples moved to heroku samples
Introduced ModelBuilderTestHarness#initModuleDir(..)
Add inline documentation for root.
Rename README and document root.
Bump version.
Add mote executable.
Bump version.
init kdtree test
add tree and tree node; triangle as primitive; need polymorph
revert renaming and just re-add filters after the SOLR search is done
adding and removing search subscription directly fron search page
added support for counting pulses... in f120 port 0.0!
Site updated at 2012-12-11 19:00:36 UTC
HPF bug fix

fixed inlet ordering issue. Now signal input is really signal input.
Add ability to deploy edigen to emuStudio repository
Merge pull request #13 from vbmacher/master

Add ability to deploy edigen to emuStudio repository
fix: typo to init.d
add ssh ploneuser
add: Unified Installer
import nosound option
added 404 catching to separate errors from intentions
fixed mutli-load configuration bug
[ext/JSON] sync from upstream
increase the reason

增加 转账原因
redirect_root default is actually false.  Fix this in the readme
modification of the languageSwitcher view helper + css3 animation and svg images
Add the ability to add/modify facls
Led remote swizzle fix.
Merge branch 'net' of github.com:techinc/lewd
Created interfaces for ackermancar, arduionomega2560 board and cyclops car.
Changes in shaders to support specular illumination (WIP)
Adapting agent to work with the cyclops car component
fix spec
fix fuck deleted macro
add summon pet and fix profess
dist add summonpet
Created files for models
fixed maintain bug and removed extra output
left one debug output
rename one folder
factor out chromaprint client code
remove unused imports and symbols
refactor common view code into track.js
add in ReqResp object
adding trigger and dialog image
Copy the diff example from redis-rdb-tools
trying with poll() - 2
removed configFactory constructor argument to EnableNHibernate container extension
Remove firget imports
Merge pull request #213 from tonal/forget-import

Remove firget imports
Merge branch 'master' of https://github.com/scrapy/scrapy
Added a _trackable function that relies on the dontTrackStates attribute. It'll check to make sure any of the dontTrackStates array values are not in the current data-status-type attribute. So you can use it to strip functionality from certain date periods
Tilføjet doseringimporter
Merged
Tilføjet tom skal på doseringimporter
added cm_distance and documentation
added border width option
User story #3, and auto-login when a user signs up.
some overview fixes
Super Marisa Land "Alice": Stage 11 completed in 39.80 seconds
changes from automatic review
Merge pull request #19 from JMSBot/review-10a19ff4

Changes from Automatic Review
rupost has been changed
add title and sublitle
HBASE-6438 RegionAlreadyInTransitionException needs to give more info to avoid assignment inconsistencies (Rajesh)



git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1385209 13f79535-47bb-0310-9956-ffa450edef68
Makefiles:  Update noinst_headers

Added headers for new tests and benchmarks to the non installed headers
list, so they will be included in the tarball.  This is needed for building
packages that included the test programs.
ceph.spec.in:  Add rest-bench and ceph-test packages.
ceph.spec.in:  Enable rest-bench and debug configure options
Makefiles:  Use AM_CXXFLAGS for crypto library compiler options

In configure.ac, add the crypto library compiler flags to AM_CXXFLAGS and in
src/Makefile remove CRYPTO_CXXFLAGS and use only AM_CXXFLAGS which now has
the flags if needed.
ObjectContents.h:  Fix compiler warning by adding parenthesis
packaging:  Add ceph-test debian package

The ceph-test package includes optional test and benchmarking programs.
Makefile:  Add test/osdc/FakeWriteback.h to noship-headers.
ceph.spec.in:	Add new test programs to package.
ceph.spec.in:  Fix typo.
auth: improve logging

Add some logging around failure cases.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
auth: changed order of test for legacy and new authentication

Changed order of test for legacy and new configuration options
in several places.

Signed-off-by: Peter Reiher <reiher@inktank.com>
auth: set default auth_client_required

Fixes: #3578
Set auth_client_required to default to "cephx, none".

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
PG: remove last_epoch_started asserts in proc_primary_info

These asserts are valid for a uniform cluster, but they won't hold
for a replica running a version without the info.last_epoch_started
patch.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 0756052cff542ab02d653b40c37a645b395f31b3)
debian: add ceph.postinst to remove /etc/init/ceph.conf on update

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
init-ceph: =, not ==

Reported-by: v@alan.lt
Signed-off-by: Sage Weil <sage@inktank.com>
Merge branch 'testing' into next
mon: Elector: init elector before each election

Fixes: #3587

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
crush/CrushWrapper: do not crash if you move an item with no current home

This will let us take an existing orphan and place it somewhere.

Signed-off-by: Sage Weil <sage@inktank.com>
Merge remote-tracking branch 'gh/wip-ceph-test' into next
osd: make pool_stat_t encoding backward compatible with v0.41 and older

In particular, this is the encoding that is used in precise.

Fixes: #3212
Signed-off-by: Sage Weil <sage@inktank.com>
New style for tags: UL, LI, CITE, CODE, BLOCKQUOTE.
Fixed Api::VideosController#index

- Fixed wrong condtion in query. We are looking for videos.user_id not
  for videos.id
Show num clicks from the start.
Make the tests pass again, remove unverified check.
Add new movie_list.json
Try to fix Visual Studio compiler warning.

Related to commit 119ab519a4403099cff027bfb75a7f88d7bd95fa.
Fixed #3678 (stlcstrReturn for classes which don't provide a std::string)
Fixed #4304 (False positive during an array declaration)
Fixed #4227 (False positive: Comparison of a boolean with an integer (double dResult=false))
CheckAssignIf: Add more testcases
CheckAssignIf: Better handling of various expressions in assignments
Fixed #4323 (False Positive: Null pointer dereference)
Tokenizer: use list.back() when we start the loop backwards.
Uninitialized variables: Fixed TODO testcase
Removed unnecessary pattern "const|" - typeStartToken() never points to "const"
Fixed string literals in several unit tests (one test failing - changed it to TODO)
Fixed again #2963 (FP: Typedef names considered duplicate because __LINE__ not expanded).

It is caused by a regression introduced with commit 75fbe310fffe781f8c788d28b76ccd538765181e. Add also a TODO in the non working detection inside TestSimplifyTokens::simplifyTypedef98.
Fixed #3190 (SymbolDatabase: Parse of sub class constructor fails)
Uninitialized variables: Fixed false negative in new checking when using while loops
Cleanup: Removed += and -= patterns from the checks. These should be simplified.
Array index checking: Fixed TODO comment (false negatives when using ?:)
Fixed #4187 (False positive: Variable inside a lambda is reported as uninitialized)
Fixed invalid function in symboldatabase causing endless recursion (VS10 warning) by const_cast
times: added shell script that executes previous tags
Fixed #4357: Wrongly configured slot caused Ok() handler being not called.
gdk_pixbuf_unref is deprecated.

According to the docs [1], this functions has been deprecated long ago.
Only today, the compiler started printing warnings about this. ;-)

[1] http://developer.gnome.org/gdk-pixbuf/stable/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html
added .pydevproject
Added use strict
Make sure line breaks are trimmed as well
Added array.indexOf and a new way in finding globals
Build new 0.0.6
Fix #include path for case-senstive file systems.
Fix dependency on Vico-Prefix.pth for case-sensitive systems.
fixloadmoreforie
Added crosscommit alias and changed vim theme.
improve update cat
view state channel
Restart Tomcat and log cleaner (OSBL)
Removed engine code from the demo source code, now is used via a static library. Engine source has its own git repository.
removed core src from project, added in the original demo in a new game state. The sky stuff needs to be tweaked and also the sun needs to either be seperate or a different compute shader renderer for each other. Currently its using the same class.
ie8 list-to-grid css-text-transform
Scafr.Automapper
Merge pull request #9 from rsantosdev/master

Merge
Kleinere Fehler behoben... (nochmal)
Update these to correspond desktop machine's configs
Merge remote-tracking branch 'origin/master'

Conflicts:
	profile
Clean gibberish brought by merge
Committing some fixes in tests

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@134108 a5903396-d722-0410-b921-86c7d4935375
improving siddhi to support CEP test cases, and cleaning the code

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@133657 a5903396-d722-0410-b921-86c7d4935375
Add ability to flag barcodes as failing QC
除了还没图标外外基本可以算是release的了。。。
updated demo js for dropfile complete to add item; changed to copy examples dir to dist when building package
modified gae repository
business card titles
merge
Merge branch 'master' of https://github.com/yach17/lists
Se agregan nuevos casos de uso extendidos
Se agregan al excel modificaciones pendientes a realizar en el proyecto
estructura base para la explicacion de las clases
se describen algunas clases
Modularized code with methods and added credit card object/processing
add some test

add /application/index/test action
add /application/test/index controller
add /test/index/index module
脚本生成的class map key改为小写
修改几个Error类的位置
简化orm error
增加注释
修改use 语法风格，每个use单独一行
bugfix
bugfix
bugfix
DataMapper BEFORE_SAVE_EVENT放到BEFORE_INSERT_EVENT和BEFORE_UPDATE_EVENT之后触发
bugfix
bugfix
简化core.php内容
deleting old blocks
画像変わったよ！
Add testnet address generation
Install scripts in Python dir with make install.
Merge pull request #1 from yuuki-63/master

pulllllll
Merge pull request #1 from touhara/master

mono
new added

new added
fix repetition in README.md
update licensing link in README.md
Merge pull request #9 from silexlabs/develop

Merge from SilexLabs/develop
full 75% on hw haha
Codon position.
improved sgd efficiency, decreased widget update rate to improve performance
somewhat better examples
gui and ant actions
Some additional logic for the spider.
taking configuration nightmare out of server
Fixed delete key for zsh
Ack = better than grep
Mise en place du menu

Début d'intégration du header.
File output.
Merge pull request #9 from toomuchpete/export_script

File output.
Initial start at providing keywords for remote URI's
In progress implemnetation for keywords for remote URI. Not useable yet.
First test for keyword sqlite db read write works. Still not integrated into ui but basics are there. More tests to come.
Added delete method for keyword database manipulator. Added paramaterisable path for keywords db. Let tests create a new db each time. Better coverage of tests for keyword db.
Fixed a bug in readKeywordsFromUri signature and added test logic to ensure that deleted hash is indeed deleted
Refactoring all python-safe api useage into a wrapper class is_safe_interface.  Moved safe interface related tests into their own module. Added rst docs for the new module and its test suite. There are still a few SAFE librbary calls that have not been wrapped yet.
Fixes for failing tests post refactor (in progress)
All gui tests pass now using eclipse test runner
Fix issue preventing plugin loading in QGIS. Added widgets to options dialog for setting keywords.db path
Implemented file selector capability for keyword cache file in options
Further refactoring - create a keywords module (is_keyword_io) where we can centralise keyword functionality and begin to build a generic interface on top of that. Created accompanying test suite and api docs. All tests passing
Also move copyKeywords helper into is_keyword_io
Merge branch 'master' into keyword-database
Merge branch 'master' into keyword-database
Merge branch 'master' into keyword-database
Refactored impact calculator thread into its own module and make it inherit qobject. Cleanup to unit tests following last round of refactoring. Make keywordio a class in pursuit of nice abstracted way of dealing with keywords generically.
Much simpler implementation for impact calculator and impact calculator thread classes now that I can properly subclass qobject. Refactor of is_keyword_io into a class is working now. All gui tests pass
Added missing items to pro file for translation support and check that linquist sees all the rearranged classes nicely.
Extended keyword io to check for different provider types and whether they should be considered file or remote. Added tests to verify this works
Improvements to unit test and make connection member of ISKeywordsIO and in general make the latter more object like
In progress doc tidy up for #116
Landing page, documentation refactor in progress work for #116
Documentation updates - added install guide to user docs
More documentation cleanups towards #116
Fixes for pdf generator. Images still overlarge. See #116
Replaced theme implementation with cloud as it degrades nicely in small windows. See #116
Added options dialog help text. Working towards #116
Added reference to options dialog from keyword doc
Merge branch 'tim'
Merged in documentation update work. Closes #116
Enhance Makefile for usage by developers and users

- make deploy now uses submodules again (read-only by default)
- make install also uses submodules but changes URL to read-write
- add some helpscreen improvements
- vagrant target now removes libraries/Zend

How this works: (Thanks to Norman for pointing to [1]) The .gitmodules file contains
the read-only URLs for submodules (which is the default behaviour). The
"git submodule init" command will copy the settings from this file to the local
config file under .git. A special developer submodule make target re-configures
those URLs to the read-write ones. The same can be achieved the other way around by
issuing "make submodules" again.

[1] http://365git.tumblr.com/post/12581972612/set-up-a-submodule-where-only-you-have-write-access
Remove an unnecessary check that caused invalid xml documents not to reload, on OSX. Fixes #92
proper attack effects
When a trail is in a tunnel, space out the dashes more.
renderToPng() function to mirror the renderToPdf() one
Merge remote-tracking branch 'asciiphil/base-updates'
Added command line support for PNG/PDF rendering in toposm.py
Handle multiple redis calls properly, so remove kludge in scorer.js
Add a note about using a sorted set for /best
1 kHz sample rate added
Group timetables export to Excel: fixes and styling
Added "Download as Excel file" button
Implemented Weapon, RangedWeapon, made Food better!

Signed-off by: ZNickq<teapa011@gmail.com>
Fix duplicate 'SURVIVAL' text

Signed-off-by: Luke Granger-Brown <git@lukegb.com>
Merge pull request #39 from lukegb/fix-typo-1

Fix duplicate 'SURVIVAL' text
Merge pull request #37 from ZNickq/master

Implemented Weapon, RangedWeapon, made Food better!

Thanks @ZNickq for another contribution.
Vanilla now checks for the right protocol id, and only allows connecting if that matches!

Signed-off by ZNickq<teapa011@gmail.com>
Updated Armor, Tool, and Weapon!
Armor now has a getProtection method to get the amount it protects!
All tools now have durability!
Made GenericWeapon extend GenericTool, because they have durabilities too! (and in some cases break blocks faster)

Signed-off by ZNickq<teapa011@gmail.com>
Made biomes per-chunk-column and added a noise-based BiomeSelector
Moved VanillaMaterials init to onLoad so other plugins can more easily look up materials through MaterialData
Remove unused imports
Merge pull request #42 from ZNickq/tools

Updated Armor, Tool, and Weapon!

Thanks again @ZNickq
Some changes to the networking part, changed PlayNote to BlockAction and updated EntityAction a little!

Signed-off by ZNickq<teapa011@gmail.com>
Merge pull request #40 from ZNickq/master

Vanilla now checks for the right protocol id, and only allows connecting if that matches!
Merge pull request #43 from ZNickq/blockaction

Some changes to the networking part, changed PlayNote to BlockAction and updated EntityAction a little!
Derp

Signed-off by ZNickq<teapa011@gmail.com>
Merge pull request #44 from ZNickq/blockaction

Derp

Yeah...derp....@ZNickq should be shot. Fixes VanillaProtocol test with changes from prior commit.
Filled all hardness and friction values for VanillaMaterials!

Signed-off by ZNickq<teapa011@gmail.com>
Merge pull request #47 from ZNickq/patch1

Filled all hardness and friction values for VanillaMaterials!

Thanks again @ZNickq :).
Implemented flower decorator!

Signed-off by ZNickq<teapa011@gmail.com>
Improved flower decorator, fixed some bugs with the tree decorator!

Signed-off by ZNickq<teapa011@gmail.com>
Fixed JavaDocs, removed debug message!

Signed-off by ZNickq<teapa011@gmail.com>
Updated to use LIBMINC instead of MINC
addedd .gitignore
COMP: More changes
DOC: Changing description from displacement to exponential

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1575 fd2da0a4-d968-48df-9cb5-d8c496287cbf
BUG:  Fixing exponential transforms.

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1576 fd2da0a4-d968-48df-9cb5-d8c496287cbf
[ADD] CSV Parsing: support arbitrary codepoints as separators
[FIX] Unregister query iterator after closing of query processor
redo ajax request and routes
Fix for exclusive nodes in resource checks
Removed original docs (used before I decided to use bootstrap + html
Added a README in case anyone else wants their resume online.
removed extranoues files
Merge branch 'gh-pages'
Clean up readme
Integrated jinja2 to modularize resume

This just makes editing a little easier in my opinion.
Change paragraphs to bullet points in work section
Update skills and technologies
Improved copy in Projects section
Remove specific technologies from work bullet

I think it's somewhat irrelevant in an accomplishment-oriented bullet.
Add topics I'm currently studying to education
Change title to include 'Resume'
Add VC 10.0 project files
merge conflicts in Journal.lhs resolved
Merge branch 'master' of github.com:Course/HaskDB
Add 1 to width if even to prevent text wrapping
Ensure rgba() border colours are supported fully. Thanks to Tanguy Krotoff for pointing this ommision out
fixed ObjectType variable in all classes
Merge pull request #21 from Roger-F-/master

Roger: I logged in DC2012 and merged this request!
move BeautifulSoup folder
remove pyc files

due to the way python handles pyc files, every new clone of the mylar
repo would result in them being rebuilt. Best to just keep the corresponding py
file
QUASAR: Remove many debug prints, fix remove configuration, add pi chart

Remove Configuration wasn't deleting the config entry from the 
configurations.txt file, meaning that if you made a new configuration
named 'asdf', removed it, and tried to either make a new configuration
with the same name, or clone an existing configuration and give it that same
name, the process wouldn't complete adequately. 

There's now a pi chart on the config summary screen that shows how many
nodes there are per profile within a configuration.

Issue #6
Added comments to the demo
correction bug fonction comparertableaux
tableaux constant pour comparerTableaux
headers
fonction verifier1D_Ligne
improve
Release of com.dexels.navajo.document version 2.2.7
Development stream of com.dexels.navajo.document version 2.2.8
fix fixbug bugs
clean deprecations
use java 1.6 mode
clean warnings
fix statically found potential bugs
fix warnings
Fix xtext warnings
Move Debug code to hxcpp haxelib
[cs] Added String reflection, fixed Issue #940
[java/cs] Added substring function
[java/cs] initial haxe.io.* API. C# has all of them working (needs testing); Java still only has haxe.io.Bytes implemented.
[cs] missing I/O files
[java] BytesBuffer API
add created proxy as dependency
changed is_const to make_const to allow transformations such as inline (fixed issue #926)
hxml cleanup
Added the failed server test
Started the nsSocket server app
Add test for determinant in identity matrix
Introduce threads in inv(), det() and rank()

There is a problem of time in some methods now.
Since they've (inv(), det() and rank()) used the Gauss algo in different variations they require the time about O(n^3),
and we get the bottleneck here.
So, add class MatrixTread that calculates the generallity of these methods - the take away of rows.

Also it's important to think how many threads the client should run at the time?
The operation of the new thread creating is quite long and it is wasteful to create,
for example, 8 threads to multiply two matrices with size about 2. Even about 8.
So, the count of the threads should change dynamically and it must depend on the range the threads process.
That's why we need the ThreadController: it chooses the number of threads and distributes the work around them.
Divide matrix threads into two groups and add one for the matrix multiplying

Matrix multiplying is another operation that requires the time about O(n^3).
Because the MatrixThread does the work that differs from the cycle in multiplying
we needed to create another class. So, it's better to create the thread-tree where we have an abstract class that doesn't do any work
and all the workers are the children of this class. And the same situation with the AbstractMatrixThreadController and so on.
Due to these changes the name MatrixThread is not relevant now, so it's better to rename this class into MatrixGaussThread
because this class is used in inv(), det() and rank() methods only that use the Gauss algo.
yaoming
Merge pull request #1 from sh1k1/master

yaoming
Readme screenies.
New "getting started"/home screen
mas backend
added Utilites package and structure
- Restyled with bootstrap
Moved database creation and datasource creation to a property #63
Improved html for tribes and wiki
Fix update
* Fixed strange characters (visible only in iso)
* Added a filter to children
* Fixed .content("");
* Fixed not()
motion-test: fix height parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
x86/motion_est: assert->av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mux: change 1 assert->av_assert1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
colorspace-test: add few more tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Signed-off-by: Marton Balint <cus@passwd.hu>
libopenjpegdec: unbreak yuva420p support

Regression introduced in b7a928b2d1563575a8d9ec5aa606f735620b38ab.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg

Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-32639 files: Improved File Manager download and zip support

Conflicts:

	lib/filestorage/zip_packer.php
	lib/form/filemanager.js
MDL-32639 files: Zipping a folder does not overwrite existing files
MDL-31622 Forms: Date selector supports i18n
MDL-28346 Backup: Added new status 'warning' for backup result
MDL-28346 Backup: Restore does not fail when a file is missing

Conflicts:

	backup/util/dbops/restore_dbops.class.php
MDL-28346 Backup: Backup does not fail when a file is missing

Conflicts:

	backup/util/ui/backup_ui_stage.class.php
MDL-34607 File API: Natural sort on area tree files
MDL-34607 Folder: Remove any sort order during upgrade
MDL-36323 usability: Resolving conflicts due to bad rebase
Fixing custom Add button label in list view.
margin bottom on li canvas
enemy up
Merge branch 'master' of github.com:Fedake/Pacman

Conflicts:
	Engine.cpp
Merge branch 'master' of github.com:Fedake/Pacman
admin all over
inscricao faltando apenas validacao pro pagina
fixing json test and adding comment about older browser support for parseJSON function
Salvo MRU

Added mru functionality to the shell program
copy fichier ok sur client
Fix d3.behavior.drag for Android.

It turns out that Android's changedTouches can have identifiers of 0.
Fix typo.
Take into account clipping when computing areas.

This can be optimised later.
Take into account clipping when computing centroids.
Respect clipping for line and point centroids.
Optimise d3.geo.path.area.
Merge remote-tracking branch 'remotes/jasondavies/drag-android': touchID for Android can be zero(0), hence comparisons must be explicitly against 'null'

Conflicts:
	d3.js
	d3.min.js
	src/behavior/drag.js
updated submodules
Optimise d3.geo.path.centroid.
Simplify.
Clarify convex polygon comment.
Fix loss of significance for d3.geom.polygon.area.
Set node velocity to zero when fixed.

This should avoid unintended jitter on mouseover.
Merge branch 'geo-area' of https://github.com/jasondavies/d3 into 3.0
Merge branch 'drag-android' of https://github.com/jasondavies/d3 into 3.0
Add placeholder d3.geo.centroid.
Add d3.shuffle. Fixes #948.
s/º/°/g
Merge pull request #949 from jasondavies/°

s/º/°/g
Add d3.geo.centroid.

Polygons are temporarily treated as lines while I work on adding area
weighting.

See #941.
Make reactor lazy to allow reads from output if input is not provided.
Somewhere along the line the simple case of PCRE (just add -lpcre to LIBS) stopped working. Fixed.
create new scores for new cards
[DEV] Multiline button is OK ==> gui display is not compleately ended
Tentativo di sostituire i dp con i px (prova solo sull'header)
Workaround for gcc overoptimization compiler bug.
Merge pull request #232 from asmorkalov:compiler_bug_workaround
updated mark_nvidia.py script
vorzeitiges Ende implementiert, aber ungetestet
test_namespace added, playing with the classes because namespaces can be annoying :P
move createTempDir into the test code base. It's not used in the regular code base
Select elements get a default dropdown choice when they are required.
Fixes #145
added tasks module with named FIFO task queues for easy multithreading
Fix constraints test for jetbrains.mps.lang.test.runtime model
make project
fix compilation
can't rename smth to empty string
update error field  in constructor of RenameDialog
Added tictactoe package and removed Challenge 2
written test and program code to compile the test but also fail
Add python argparse-1.2.1 module
Auto create submodule(s) with the rake update command
Add a dedicated script to configure the prompt
Merge branch 'prompt'
Update some readme info, also test CIA on github
computer science
first commit
删除无关文件
添加图片
make a test
remove test
Merge branch 'master' into gh-pages
remove something
Fixed Search (InputText in include files).
System: added ClipString to prevent overlap.
Options: Fixed issue with new @include behavior.
Cleaned up some temp files
added gitignore for bin folder
For got to add engfmt and textcolors to install script.
Added test for scripting capabilities.
delete 无效的路由
OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES

Incremental changes to the logic over time have led to simply
initializing the cache entry with the environment value.
OS X: If CMAKE_OSX_SYSROOT is already set do not compute default

The default computation logic is non-trivial.  Do not bother with it if
the value is already known.
OS X: Further improve default CMAKE_OSX_SYSROOT selection

Since commit 230ea218 (OS X: Improve default CMAKE_OSX_SYSROOT
selection, 2012-09-21) we always set CMAKE_OSX_SYSROOT if any SDK is
found in order to support Makefile generator builds with Xcode >= 4.3
without the command-line tools installed.  However, in the basic
POSIX-only case of the Makefile generator with command-line tools and no
CMAKE_OSX_ARCHITECTURES we should not select any SDK by default.
Merge topic 'osx-sysroot-cleanup' into next

43b7479 OS X: Further improve default CMAKE_OSX_SYSROOT selection
2690738 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default
7995722 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES
Bug fix in task start/finish lines
A pilot using xcsoar software a few days ago reported a problem with the task startline not being accurate at the borders.
It seems that the error depends on the fact that, as the pilot explains, the start line is not 90 degrees exactly to the target point.
We assume the same can happen with the finish line.

This patch is fixing the calculation of the angle, by applying the Great Circle convergency which was not taken into account.
The strange dashed line in AAT task appearing in wrong place has been removed.
Fix problem in replay logger while dealing with position fixes in the IGC file having the same timestamp.
It was causing an assertion failure.
Update changes
experimenting with the citation example
Merge branch 'master' of https://github.com/LNFY/jschurch
try to debug prov-tracking 2
ADD: i18n-support (language)
changed the name of the program
support choosing contacts
Merge pull request #12 from tikiet/master

support choosing contacts
5D3 sraw support
Modify CdrService so it updates a CDR when it exists and inserts one otherwise
CdrRetrievalJob
Add nl.limesco.cserv.cdr.* bundles to -runbundles
run using new function, good result for
running with new functions, good result for simushots and l1 migration
reorder functions
remove dubious
running with new functions, however, still  not a good way to compare two lasso problem, do not need to add another parameter, for comparing lasso proble, simply let them run for same iterations, with same optTol, if needed can be modified later
Fixed bug in language file for task comment
Update to latest

NOTE: The targetline bug is still there, i haven't figured it out now,
but i'll keep searching for a solution.
Return true or false with remove.
Minor bug fixes, return true or false with remove.
Moved Translator to submodule
Continued feature clicking work.
More feature skeleton.
Adding sql function. Works.
Resized splash dialog to 850x550.
Add index query for feature count, class, and titles.
Attempting IE compatibility for gbif web service api. Dynamic search results counts (yay).
Update, paging refactor
line : extract a line keeping dimensionnality infos
only set -Wfatal-errors with GCC, prevents compilation with MSVC
fix constness problems in function_find
inv is now run_assign
ensure all files end with a newline
initialize jpvt in full_qr_solve
flipdim
[MOSYNC-2540] Examples: Removed LocalFiles.bin from version control.
[MOSYNC-2540] Wormhole: Clarified a comment.
Merge remote-tracking branch 'origin/ThreeTwo' into ThreeTwo
[MOSYNC-2540] Android: Fixed a bug in the WebWidget base URL handling, so that you can pass in a base URL without a schema (just a path), and that will be used as the new base URL.
[MOSYNC-2540] Examples: Changed a button label in PhotoGallery to make it clear that you need to press the button to update.
Merge pull request #275 from divineprog/ThreeTwo

Fixed a bug on Android WebView and updated the UI (button label) in PhotoGallery
download löschen
Merge branch 'master' of github.com:Mobots/mobots
sudo rausgenommen
Merge branch 'master' of github.com:Mobots/mobots
Corrected license statements not changed
select date when pageinit
fds`
Made enhancements to inferring the ID field

First, now searches for field called Id in a case-insensitive manner. If
it doesn't find one, it looks for "object name" + "ID" (such as
"partid"). If not, it tries it with an underscore separator ("part_id").
Merge branch 'master' of https://github.com/clarkrb/NEST into clarkrb-master

Conflicts:
	src/Nest/ElasticClient-Inferno.cs
Pulled #73 and moved new logic into IdResolver
Implemented Timer class - times the game and supplies nicely formatted time for rendering in HUD
Update code to Car hardware 2.0
Fix upnp following UTC conversion.

Starttime is now always UTC and doesn't need converting a second time.

This could/should have been a no-op but the QT driver marks all
datetimes loaded from the database as localtime instead of UTC.
More private bin path fixes
Merge pull request #876 from grumpydev/PrivateBinPathFix-873

More private bin path fixes
Aggiunta riga mancante.
haxe: Remove build files of haxelib/haxedoc early.

Previously, we installed std by omitting the tools directory. Now, there are
occasions where you actually want to use things like tools.haxelib from within
your project, for example to create something that interfaces with the haxelib
API. So we now just remove all files in there that were created during the main
build in postBuild.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Revert "ffmpeg: update to 1.0"

This reverts commit 8ea11ec677e5d5ad8f2a74f9684dafdeffd4882c.

It was breaking things, as said by Eelco said in nix-dev:
http://hydra.nixos.org/eval/742774
ffmpeg: adding 1.0 back as an attribute apart.
Added readme file

Signed-off-by: Norbo11 <norbo11@googlemail.com>
fixed a bug with notice display

Signed-off-by: Norbo11 <norbo11@googlemail.com>
[init] the user can configure the number of cores to use on init

opam init -cores X
Only globals args starts by --, so rename --kind to -kind
[init] update the spec for being able to set-up the number of cores on the command line
[docs] update the API doc
Make the read_line function a bit more robust in case the file error exists
Set the default number of cores to 1
Merge branch 'master' of github.com:OCamlPro/opam
Adding perf test program
commented memory db data source for future revisiting
Zusicherung:
*) Doppelkeks
Need upper bound on base for cabal to be happy
Update values in-place if possible
Changes, Added Kobolds
Added 60 FPS mod, dds texture loading, tweak SSAO
ajout du fichier doc.org
working, Memcheck-clean, documented lab_07
Improved iTunes Tags in the rss feed
Moar fixes to the CalendarPanel
Merge branch 'master' of https://Kagutsuchi@github.com/Proj11/Proj11.git
Update

Styling the readme ><
Add widgets to slim the pokelist down further.
Merge branch 'dev' into feature/morefilters
Add signals to the menu items
Clean up filter logic to easliy add new filters
Clean up valid() to be flow-through.  Needs more work for undefined pokemon
This may not be the best place for it, but this filters on evolution.
This has no business being a method
Create a filtered model for displaying the pokemon lists to avoid rebuilding each time.
Remove calls to add_pokemon()
reorg for clarity
These really shouldn't be instance.  They shouldn't even be here.  They should be in a config script somewhere.
pyLint inspired renames.
initial destructive support for B2&W2
Expose B2&W2
Merge branch 'feature/morefilters' into dev
Unown, evo, et al don't need filter models
build national along with redional pages.
file operations are not side effects in bitcask_eqc
No need to explicitly start pulse_application_controller

This is done automatically when calling (pulse_)application:start/1 in
the latest pulse_otp.
thru exercise 16
Optimized upload avatar
RAXAJSS-111 Create PatientListService for CRUD and Helper methods to PatientListDAO
RAXAJSS-111 Create PatientListService for CRUD and Helper methods to PatientListDAO
-added in getEncountersInPatientList
-added some more privilege testing
RAXAJSS-111 merging with raxacore
RAXAJSS-111 merging with raxacore x2
Merging RAXAJSS-111 with raxacore x3
RAXAJSS-111 renaming getPatientsInPatientList to match convention
RAXAJSS-111 adding raxa license header, adding logging for date parsing errors
RAXAJSS-111 adding inList and notInList for PatientList service layer
RAXAJSS-111 modifying moduleApplicationContext.xml to load correctly
RAXAJSS-111 refactoring JUnit tests so each test checks only one part of a function
RAXAJSS-111 adding more descriptive error message for date parser
Merge pull request #11 from johnstoecker/master

RAXAJSS-111 Create PatientListService for CRUD and Helper methods to PatientListDAO
Defined Series, a datatype which is a vector of values with an index.
Basic stats functions: mean, variance and stddev.
WIP on a data structure for a factor.
Index to assignment for Factor values.
Minor reorg of functions.  Nothing new.
Create an index to assist natural join step in Factor Product operation.
Simple type alias of various prims.  e.g., VarId as Integer
Added Model concept.
Utility functions to canonicalize factore (sort vars in lexical order).
Factor Variables are now denoted as Symbols and not Integers.
Base Model and Factor with tests.
Start of PGM doc scribblings.
Sketch of some incomplete code implementing a Lens.
Added Categorical Series (Factors, Nominals whathaveyou).
WIP load tab delimited files.
Renamed core directory to frame.
WIP - Loading of tab delimited files.
 - CategoricalSeries loading and building.
Git ignore zo files.
Fix require(s) for change in dir structure from core -> frame.
Loading of tab delim files containing Numeric or Categorical Series.
Ajax for small messages and follows

Also for notification destroy. Todo:
* Smooth follow / unfollow
* notification create (push with faye)
* perhaps bot/human and some other places?
删除一些不必要的东西
section helper and spell checking.
Added prototype 1 class examples

Most of these have empty methods, to be filled in when developing actual
site.
More methods were added in Config class.
ignort
sched/backfill: Improve accuracy of expected job start

This patch adds logic to work around advanced reservations better.
Correct agent purge logic for a newer message type
srun will ignore SIGCONT while attempting to allocate a job step

Previously the SIGCONT would be generated easily as part of gang
scheduling and cause the job step initiaition to abort.
This is being back-ported from SLURM v2.5/master.
Update 13/08/2012

Extended readme update
Fix: for perl 5.10 we also cannot use REGEXP *re= SvRX(sv); so shuffled some #defines around
Make tester tools die on invalid input
Tests use Test::LongString
Move script onto file + fix popup
proofreading sus what is
more work on flow of sustainable design bit
Menübuttons benannt
don't overwrite database; retrieve randomly generated admin password
BUG: Don't ask for scene overwrite if not needed

If the scene item is unchecked, that means the scene is not saved.
So even if the scene file already exists, don't show a dialog asking to the
user if it's ok to overwrite.
Make sure in that case that the scene RootDirectory is restored.
Closes #2010

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20112 3bd1e089-480b-0410-8dfb-8563597acbee
Simplify list view on answers.
Remove radio button, changed to just item selection.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	bin/Smuacs.apk
	gen/com/altekis/smuacs/R.java
	res/layout/activity_turn.xml
	res/layout/answer_rowlayout.xml
	src/com/altekis/smuacs/AnswerArrayAdapter.java
	src/com/altekis/smuacs/TurnActivity.java
Support JSONP callback in JsonStrategy
Merge branch 'feature/json-strategy-support-jsonp' into integration
Positive logic makes this easier to read
Merge branch 'feature/module-manager-positive-logic' into integration
Update other/upgrade_2-1_mysql.sql
Update other/upgrade_2-1_postgresql.sql
Update other/upgrade_2-1_sqlite.sql
Merge pull request #20 from norv/master

Small miss in upgrade scripts
adding coment
Added basic functional for syslog
some const variable modifed
fixed errors
added base file name to syslog
 readme
Merge branch 'feature'
Added week4 material, which builds upon week3
Modified movies.sql
added tic tac toe example
added tic tac toe example
Added startup icon and appicon to tic tac toe
Added startup icon and appicon to tic tac toe
Merge branch 'master' of https://github.com/rioleo/CS147
Added gitignore
Added week5
Merge branch 'master' of https://github.com/rioleo/CS147
Added menu and local storage examples
Added week 5 final code
Added week 6
Merge branch 'master' of https://github.com/rioleo/CS147
Added week 7
Added jQuery UI
Making sure week7 is in
Merge branch 'master' of https://github.com/rioleo/CS147
Added week 8 material
Merge branch 'master' of https://github.com/rioleo/CS147
Refactoring + added QuartzCore import to JZMenu.h
Added working keyboard buffer and cursor
OmStang - Add apple support image

default log when IOS user add shortcut to desktop
Add test for the "flatten" vector case

This case is similar to what is used in DeepLearningBenchmarks
Make tests more accurate
Fix some pep8/pyflakes violations
Merge pull request #1039 from lamblin/test_softmaxgrad_flatten

Add test for the "flatten" vector case
Changes to the center and display of data
Opérationnel

Ç
Opérationnel

Ça marche.
1. Lancer le serveur
2. Ouvrir la page http://localhost:8182/aeroports
3. Yop
Ne reconnaît que GET sur /aeroports et renvoie un objet non-sérialisé
créé statiquement. Donc y’a encore à faire.
Registration functionality now works.
added a note on installing kvirc under win vista/seven with UAC

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6169 17fca916-40b9-46aa-a4ea-0a15b648b75c
fix a warning using clang; fix a wrong cmake variable used in fixup_bundle

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6164 17fca916-40b9-46aa-a4ea-0a15b648b75c
ENG-3364: Fix replaying txns on a live rejoining node in a replica cluster.

Must return the invocation so that the original txnId can be passed on to the
procedure.
Fix for ENG-3332. Make TestGiantDeletesSuite not slow.
Minor fix for new fragment code
Rework of ProcedureRunner to make it more clear and more performant.
Now batches are only broken up if repl-reads are mixed with other txns.
Also streamlined, renamed and removed several internal methods, levergaing new adhoc caching in the EE to load all plans for a batch up front.
Cast away int64/int32 depId confusion in IPC client.

This fixes the build. JH mentioned he has a to-do to
fix the java-ee interface difference for dep id
sizes.
Rolling back commit listed below.

I like what this commit does, but it doesn't work for IV2 and it introduces a crazy-hard to hit bug I found. I have a new way to solve both problems, but I can't sneak it into IV21.

https://github.com/VoltDB/voltdb/commit/151e13c42de13e45b7812b699e3b1f1dd4377af8
Update the documentation pdfs.
Merge branch 'master' of github.com:VoltDB/voltdb
Merge remote-tracking branch 'origin/ENG-3364'

r=jhugg
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-3001
Make varbinary work in sqlcmd for user procs, without tearing out exisiting param processing. r=jh. ENG-3101
Remove debug printf()
Merge remote-tracking branch 'origin/master' into iv2-master
Merge branch 'eng2401-integration'
ENG-3508 Demote REJOIN console messages to reduce noise.
Merge "master" into voltcore.
updateing homepage to reflect current events... we should probably django that sometime so we dont have to update the repo for the home page...
Undo print
Stock Items filter
Removes duplicated class MySQLStoraqe
v0.0.7.1
inital changes
final changes
Merge branch 'master' of github.com:opscode-cookbooks/iis
Merge pull request #3 from Youscribe/correct_typo_pool

[COOK-1283] correct typo error on apppool
Merge pull request #4 from Youscribe/mod_app_init

[COOK-1284] Add recipe for "Application Initialization" module
Merge pull request #5 from Youscribe/native_binding

[COOK-1285] add support for native bindings
set app pool for website
attributes only for application_pool
add command to set app_pool on website
revert mistake on resources/site.rb
whitespace and tab/space cleanup
COOK-1449 adding doublequote around pool name to make sure only the pool is returned.
Merge pull request #8 from kendrickm/COOK-1449

COOK-1449 adding doublequote around pool name to make sure only the pool is returned.
Merge pull request #1 from hh/master

COOK-1061 iis set/configure pool
:Merge branch 'master' of git://github.com/opscode-cookbooks/iis

Conflicts:
	providers/site.rb
	resources/site.rb
ApplicationInitialization is stable
add initialize to resources
Added support for migrating down.
Added newline to help options
Made the tests running again.
Added test for link-target fixing

This behavior was initially introduced in v0.3.9
Resetting the topicview now also collapses the userlist
Fixes unable to click on user avatar in TopicView.
Merge branch 'hotfix/0.3.7' into develop
Merge branch 'hotfix/0.5.1'
Merge branch 'release/0.5.2'

* release/0.5.2:
  Bumped version nr
  Only lock the edit + delete buttons on locked posts. Fixes #127
  Fixes 'read all' not reloading topic properly
  Fixed typos in wobble munin plugins
  Fixes callback invocation in retry_callback
  Add a wobble_config object to provide the configuration path to the api endpoint.
  Moved config loading to Autoload.php
  Increased sleeping time on connection error
Merge branch 'release/0.5.3'

* release/0.5.3:
  Refactored resize_observer into proper object.
  Fixes mobile client not reopening topic on reload
  Refactored mobile client to properly support the back button also for overview/contacts.
  If there is another window.onload => Still call it
Bumped version nr.
Merge branch 'release/0.5.4'

* release/0.5.4:
  Bumped version nr.
Make the time field more readable when it is selected.
Fixed inclusion of renamed script
Merge branch 'hotfix/0.5.5' into develop
Moved the who-am-i module logic into a separate file.
- Updated Scribe Scrolls to account for Dimension Door spells/scrolls introduced by Tutu and D0 Tweaks
Merge branch 'maintenance' into WIP
RR v4.48 FINAL

- Updated the readme
Merge branch 'maintenance' into WIP
- Forgot to set the Dimension Door variables to 0 if Tutu/D0Tweaks aren't present... sigh
Merge branch 'maintenance' into WIP
Updated home location
README file for the english people.
Performance: Remove modulo operators in Plotter
Add offset parameter to DateNumberFormat
Support single-precision floats in Plotter
Update ignored files
changing email line split string
enlarging text fields in members form
fixing routes
news and settings dev branches
fixing member seeds
generating news
adding recent news to side menu
last news item on home, tweaking news pages
added fields to sample Task response

fields:
-payload
-updated_at
-created_at
Clear the sessionStorage
Authentication parameters moved to http headers
added some text in the overview section @afein
removed pdf (they increase the repo size and produce merge conflics
gitignore them @afein)
Merge remote-tracking branch 'greg/master'