labofsahil/github-event-dataset-2012 huggingface dataset:
[lib] Update README.md formatting.
Move cachers into separate module
Rewrite cachers so that build_dir is not exposed directly
Koeien in de sloot
index: 文字列等がいけるようになったぞ
to pull make
merged driver
command line args
fix driver
post phase1 cleanup
merged with pre-fix build
message for hku
fixed a few things one users chatroom page
Some more starfield tweaks
Player controlled ship (W, A, D)
Zoom level depending on window size and velocity
updated the emacs and moved exports
pois with sparql added
some LOD stuff
[plugin:xcode] support absolute path

リンクURLと画像URLで URL スキームとホスト名を省いた絶対パスに対応した。
Version 0.25
forgot to return self
fixes #2 do not truncate option values :-)
fixing up child process magic
1.2.1
working on tracking status
Ensure CaptureController is hidden whenever modal dialogs from the Device Walkthrough are visible.  Ensure that popover returns whenever the modal dialog is dismissed.
Ensure position in list does not change on device rotation from portrait to landscape when selected row in portrait is near the bottom of the list
Merge branch 'Development' of https://github.com/nbcl-kayee/wsabi2 into Greg
added load dump starter script
perform more strict syslog message parsing
ParticleViewer in progress
Fix some merging issues
Merge branch 'master' of https://github.com/ndsmyter/Robotica

Conflicts:
	src/brains/Brains.java
Just pushed Ctrl+Shift+F for some outlining
Merge branch 'master' of https://github.com/ndsmyter/Robotica
Created basic pages tree structure
tidy up logging
handle shutdown scripts properly
Implemented dependency initialization module
Strip spaces on query results as well.
Fixed TRS endian swap. Fixed some compile warnings.
fixed pod
some code fixed
initial commit
Merge branch 'master' of github.com:nels4lif/annuaire
added files from download

here you go :)
An Darstellung der Pfeile (Konvergenz/Implikation) gebastelt, kleinere Korrekturen in Kapiteln 6 und 9
szse
Added minimal version of youtube
add color chart slideshow images
DPMG64 remove valgrind option
Merge branch 'develop' of github.com:nexr/oss-collectd
release ndap 1029
situacao_externa agora eh variavel global
novos metodos: notaCancelada e notaDenegada
DANFES cancelados nao tem o texto DANFE ( lei...)
Merge pull request #8 from marcosdiez/master

master
change " sign to ' sign
figuring out how to get score to add to counter
initial unittest framework
updated tag
added better tests, made code more modular, pep8
added coverage method for test
refactor tofastx, merged fastq/fasta
removed refiso
removed bam_pos special code from ETA
pep8
added test_fastx
added default mask from samtools
added code to setup virtualenv and set pythonpath
added tobed test
reworked test
renamed test
updated test
removed deprecated function
correct mask syntax
renamed test
hide etas...
testing tobedgraph - modified test.sam/bam to add plus/minus strands
error getting strand for a read in bam_iter
Work on Pop\Log Component
added use flags to metadata.xml
better errors; build changes; new gdb funcs
added feature to generate a new key for a Laravel application
updated to version 0.1.2
Merge branch 'release/0.1.2' into develop
stored wordlist length on inititalization, rather than recounting as requested

Ignore-this: 712415fa7f527c59feba6aba7e5373e4

darcs-hash:20120620203105-25d1a-0d93370d4b8963b705fb3c5458e452a9e9bb3654
added multi-sentence structures

Ignore-this: 44bc9be0d9c80bf3d624c77b5a068e8e

darcs-hash:20120624051055-25d1a-ce2d1955b54a77767278ef6a33fd65a041b80ace
move hhlib to its own package

Ignore-this: 9bf85a03b55608fb690575859223a63c

darcs-hash:20120624070543-25d1a-9106bc1fc7437eeb5ad4691d167fb8a1a96d6580
added README.md

Ignore-this: 14caedfbeefeeb3d3865e982bba6901f

darcs-hash:20120626073838-25d1a-e277deb8dddc2561127b95acab5e62016f74dcdd
better folder structure
new Driver class
moved old files
Merge pull request #1 from arieh/fixes

Fixes
fixed let expression parsing in lists
added list->hash
Links
made dummy test pass
recommender.jar and example code
[PORTTISK-793] cleaning
[PORTTISK-555] Fix trailing comma.
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-793] visual changes/ refactoring
[PORTTISK-793] divmanazer.updateExtension now does the operation for all extensions if extension is not specified. Publisher uses it to close all flyouts when going to publishmode
[PORTTISK-793] map layer handling in publisher changed
[PORTTISK-845] Fix broken startsWith
[PORTTISK-845] Check node members
[PORTTISK-845] Don't assume JSON if html() exists
[PORTTISK-845] Check for html even if presentationType is not TEXT, just in case
[PORTTISK-845] Reorder type checks as backend has changed
[PORTTISK-845] Fish out transformed bits
[PORTTISK-793] layer handling plugin for publisher
Merge branch 'develop' of ssh://haisuli/Oskari into develop
[PORTTISK-555] Recursive json2html
Merge branch 'develop' of ssh://haisuli/Oskari into feature/PORTTISK-555
Merge branch 'feature/PORTTISK-555' into develop
[PORTTISK-793] js scope fix
[PORTTISK-793] copy/paste fix
[PORTTISK-793] forminput setValue method added
Lots of updates to mvc classes.
Autoloader now looks for _autoload.php in dirs
bootstrap() improved
Content added to mvc example.
App profiler class added.
AppProfiler moved to it's own file.
Added support or non-webkit browsers with hi-res screens in retina.less
fixup test and markdown regex
Several updates to Bash/Vim

Bash:

  - Improve :h function to include `help`
  - Colors are wrapped in strong quotes
  - Update prompt to use 256 colors when available
  - Git prompt changs colors based on dirty/clean branch

Vim:

  - Adding more fonts options for the gui (that I never use)
  - *.sh files by default are treated like Bash
Bump WMVSN to 1.9.2.
Merge pull request #86 from basho/klm-fix-wmvsn

Bump WMVSN to 1.9.2.
now submit button has an icon
fixed bug
fixed
fixed typos
fixed typos and bugs
minified and improved slugify function
improved slugify call and deleted some blank spaces
modified hi.html page
new feature
file_1
added new native spotify calls from new echospot api
REMOVED THAT THING BECAUSE YEAH
changed url encoding method to fit STTwitter needs
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
refs: use constants for well-known names
branch: enhance branch moving test coverage
reset: make reset rely on git_repository_head()
clone: deploy git_repository_set_head() usage
refs: deploy git_repository_set_head() usage
clone: align type casing with convention
refspec: introduce git_refspec_transform_l()
clone: leverage refspec transform
build.sh now applies the patch downloaded from git
ak je viac ako 10 staznosti na konci index.php sa vypise poslednych desat a za tym tlacitko Dalej
[JBQA-5855] SLSB simple loadbalancing test
Configuration parameter resteasy.scan.providers TestCases
add shared test config for the domain controller client
[AS7-3764] update domain test utils to better handle a process restart
update server mgmt testcase
some restart fixes
minor
[AS7-4192] tweak execution path
[AS7-4182] fix ignored resources marshalling
[AS7-2415] update error message
[AS7-4116] update flags to maintain a consistent result format
Unnecessary archive export removed
AS7-3652: minor cleanup
Move ObjectTypeAttributeDefinition and ObjectListAttributeDefinition to controller
Delete redundant SimpleListAttributeDefinition
AS7-2281: added invocation metrics
AS7-2281: make sure all management tests run in full mode
AS7-2281: allow configuration of invocation statistics gathering
AS7-2281: add ejb3 1.3 schema parser
AS7-2281: do not process enable-statistics in app client
make sure tl-connect picks up the ip correctly
Compile CoffeeScript in the Procfile
Adds basic room functions to room.js.
Adds namespacing to javascript.  Adds default route for Room API.
[logic] Import core function to avoid errors
[templates] Update templates to CKAN 1.7
Merge branch 'task-migrate-to-ckan-1.7'
Ignoré fichiers *.sublime-workspace
AMQP-255 Fix Multi Confirm with > 1 Listener

Rabbit can piggy-back confirms - for example, if seq 1, 2, 3 are
sent, it is possible to receive ack #3 with 'multiple' set. These
means 1, 2, and 3 are acked.

This worked fine with just one listener. However, if two or
more listeners (e.g. rabbit templates) are attached, only the
listener for ack #3 is notified (regardless of whether all
the acks belong to it).

The PublisherCallbackChannel maintains two maps: seq-to-listener
and listener-to-map(seq-to-correlation).

This fixes the problem by first finding all the listeners that
have pending confirms at or below the sequence number; and then
uses the second map to send the confirms to the appropriate
listener.

AMQP-255 Polishing

PR Comments
Merge pull request #61 from garyrussell/AMQP-255

* AMQP-255:
  AMQP-255 Fix Multi Confirm with > 1 Listener
stunnel:
 * larger "services" textbox
 * compat section: replace directory with new one

git-svn-id: file:///var/svn/freetz/trunk@8886 149334a1-2f27-0410-a3b9-fc62619ac1e6
remove_ramzswap:
 * add S40-swap
 * fix echo1

git-svn-id: file:///var/svn/freetz/trunk@9739 149334a1-2f27-0410-a3b9-fc62619ac1e6
nmap:
 * fix build problems with IPv6 disabled


git-svn-id: file:///var/svn/freetz/trunk@8952 149334a1-2f27-0410-a3b9-fc62619ac1e6
5124, 5140: Don't write kernel messages to /dev/debug

git-svn-id: file:///var/svn/freetz/trunk@9362 149334a1-2f27-0410-a3b9-fc62619ac1e6
mxsup-751: Fix for ISPyB config and generation of ISPyB files in case of strategy failure
base project from the ide
taking the gitignore file aside until it's better understood
version 1.3 build 20121026T245
Changed user_nav link title form 'Diary' to 'Theatre Diaries' resolves OE-1394
Merge branch 'release/0.10.0-moorfields' of github.com:openeyes/OpenEyes into release/0.10.0-moorfields
fixed event info migration problem
Resolves Jira issue OE-1234

Fixed GA glitch reported by Ratna.
Design

NHS number added to Patient ID box...
update <scm> section in main pom.xml file to reflect the move to github and specify different urls for fecth and push as recommended at http://maven.apache.org/scm/git.html
GEOS-5081: fix LocalWorkspaceCatalog.getLayerGroupByName(String) and GeoServerPersisterTest's usage of it

git-svn-id: https://svn.codehaus.org/geoserver/trunk@17002 ef1d6e69-97e5-0310-af46-8a06194da32a
GEOS-5081: restore LocalWorkspaceCatalog.getLayerGroupByName to its original form, have interpreted it wrong, and make sure LayerGroupResource uses the specified workspace

git-svn-id: https://svn.codehaus.org/geoserver/trunk@17003 ef1d6e69-97e5-0310-af46-8a06194da32a
completed vector doc and slides
Changing the initial conditions (adding gravity)
Make OS checks independent of Qt
Lion compile fix
Merge branch 'master' of github.com:openscad/openscad
Merge branch 'master' of github.com:openscad/openscad into eigen3
cleanup for pull request
Initial clang build support
Now builds on clang-4.0 on Mac OS X Lion
Merge branch 'lion' into clang
Merge branch 'clang' of github.com:openscad/openscad into clang
Minor clang updates
Merge branch 'clang' into lion
Merge branch 'lion' of github.com:openscad/openscad into lion
Merge branch 'clang' into lion
fix compilation and linking issues on mingw crossbuild
put obj files in separate dir during mingw win32 cross compilation
allow NUMJOBS and NUMCPU + explanations. fix tabs.
Merge branch 'winfix1' of github.com:openscad/openscad into mingwcross1
put .o files of cross into separate directory. handle git issue.
improve printout notices
don't suggest paralell build by default, it can cause parser_yacc problem
Merge branch 'master' of github.com:openscad/openscad into mingwcross1

Conflicts:
	src/linearextrude.cc
dont use boost-chrono if not doing mingw build
fix documentation
cleanup
cleanup2
create dir if non-existant, bug rept by Brad Pitcher
Merge pull request #146 from openscad/mingwcross1

Mingwcross1
Bootstrapifying quota bars in launch modal window

  * Blueprint bootstrap-progress-bars
  * Success state: http://stsh.me/1zc
  * Error state: http://stsh.me/1zb

Change-Id: Id2a9644225d906dd116c9547f344d7ed2babfa08
makes api return default endpoint types. fixes bug 994151

Change-Id: I409a5415ffeb21ea81ecf540caa2cd5ac3336d90
Merge "makes api return default endpoint types. fixes bug 994151" into stable/essex
Update notes for submitted changes

* bug 963152: add a few missing files to sdist tarball
Allocation pool creation should check if gateway is in subnet

Fixes bug 1046192

If the configured gateway is not in the subnet then it should not be
used for the allocation pool creation.

Change-Id: Ifba766a13d860b58d21034db278c6b24d4c126e7
Merge "Allocation pool creation should check if gateway is in subnet"
switched to white background
Better titles for boxes
notification tray removed
extra print statements removed
hook for unhandled problems added
general status module improvements
disable auto refresh
makes news and sidebar with nice stylish borders, adds first headline static face image
Rename REDISPORT to REDIS_PORT

Match configuration template.
Bug fixes

Bug fixed for the command "copyto" and "snatshop"
Bug fixes
Reworked main module

* Fixed debug functions. Added timestamp.
* Added exception on loose
* Deleted trash files
Make test directory structure match lib.
I don't feel compelled to unit test attr_accessor.
Moving mixers into studio.

Starting on the first phase of refactoring synths and instruments.  First
we need to extract setup code from overtone.sc so it is a pure SC interface
API.  Then the Overtone specific stuff, like setting up default groups, mixers,
etc., will go in Studio.

During this I'll cleanup some of these refs and try to get our state more
organized as well.

* moved sc.mixer to studio.mixer
* using a single studio* atom for base state info, rather than a bunch
of refs.
Making native code a bit more reload friendly.

* Putting defclib form inside defonce so we don't redefine the library
each time the file is loaded.

* Cleanup up options form.
Only polling for midi devices once on boot, since they aren't detected afterwards anyway.
Hidden links for non-admin users
nytt splash-bilde, satt status bar color i plist-fila istedet for programatisk.
OWF-7299: Stack tooltip in Switcher has XSS vunerability.
Links API now gives both qty and value regardless of sort_by
Adding bench.js.
Wrong autolink_html placement broke fragment formatting
EdgeCase -> New Context
Globally works... but some incoherent behaviour... the random generation needs still love and I'll give it as soon as possible
Add license and readme
Note why we're re-writing these characters
added de only shows
Added txt data for History and Religion
Removing dspl-mongo-setup.py
Fixed issue where v:count wasn't recognized in some versions of Vim

On Vim 7.3 with patches 1-646 from Cygwin, :normal in a plugin appears
to change v:count.

On Vim 7.2 with patches 1-445 from Debian Squeeze, :normal in a plugin
does not appear to change v:count.

The latter behavior is the one desired here.  To ensure this happens
everywhere, the v:count is stored in another variable before any :normal
commands are called.
refactoring Load Function
Supports Scala Controller.

We would like to convert all controllers to Scala eventually.
This is the first patch to support Scala controller.

As a first step, we have converted easy controllers including
error page controllers.

For Scala controller, we have to define 3 methods:
  parseRequest
  executeAction
  renderResult

The first method is used to parse requests. The parsed params are propagated
to executeAction, which generates calculated values. The calculated values are
passed to renderResult, which renders the final results.

Related to #288
Bug 809974: Display "Last Updated" date and time in Device Info. r=kaze
Don't show last updated when the setting is empty
Use a multi-line label for Last Updated
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into lastUpdated
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into lastUpdated

Conflicts:
	apps/settings/index.html
	apps/settings/style/settings.css
Bug 818645 User is unable to scroll entries in the browser's Top Sites, Bookmarks, or History tabs
Bug: 814140 install mochi.test web app
Bug: 814140 mozapp needs to be set when iframe is opened.  The mozapp attribute cannot be changed or added after the iframe is initialized
Bug 817689 - Adding dark overlay to oncall

Fxing race condition between oncall photos

Adding comment
Bug 814681 - [Browser] Polish alert/confirm/prompt UI

- Use the building blocks for confirm messages
- Removes some dead code
- Improves the confirm building block with large content

also fixes bug 817878 and bug 817882
Bug 815439 - Supporting long press in DTMF and tone player.
Bug 809782 - remove background-image for offscreen thumbnails
Merge pull request #6560 from marshall/lastUpdated

Bug 809974: Display "Last Updated" date and time in Device Info. r=evelyn
Bug 818230 - Pairing does not stop when cancelled from bluetooth pairing page
Merge pull request #6899 from fabi1cazenave/bt-pair

Bug 818230 - Pairing does not stop when cancelled from bluetooth pairing page
r=kaze
Bug 818230: Cancel the pair attempt when the user says Cancel and don't show the error dialog when they do. r=kaze a=blocking-basecamp
Merge branch 'master' of github.com:mozilla-b2g/gaia
Bug 812198 - Add support for preinstalled packaged apps r=vingtetun
Merge pull request #6900 from fabricedesre/3rdparty

Bug 812198 - Add support for preinstalled packaged apps r=vingtetun
Bug 819522: Make the 'content' channel default so that the most common use cases continue to work while we await bug 810780. r=sicking a=sicking
Tag libwebsock files GPLv3
Spalatum 0.1
Merge branch 'master' of https://github.com/pbinkley/spalatum.git
permissions done on per login basis
Revert "permissions done on per login basis"

This reverts commit ff626b6f7c4fc1c7086de5fd1934ac086f098e48.
permissions done per login
vim updates
Merge branch 'master' of github.com:pbrisbin/dotfiles

* 'master' of github.com:pbrisbin/dotfiles:
  zsh - fix path bug on os x, add zsh-completion via brew
simple modification to accept any named metatag
Added new dependency parsing domain from Slav Petrov
fixed up some errors
Added HomoMarkovChain. Not tested jet.
adding even / odd class names to list items
html displays as text
basic migration implementation with lots of TODOs
[artf588145] Db st template for performance added
Properly ignore some git-relevantfiles that shouldn't be copied.
Cleaned up a warning about missing break in case.
settings page

settings p
Optimized some string manipulations
Added distance unit and location based searching
test: add AES-256 padding crypto test
crypto: remove legacy openssl compatibility code

Remove code that works around a padding bug in older versions of openssl, the
bundled version of openssl contains the bug fix.
buffer: change prototype of Data() and Length()

Make Buffer:Data() and Buffer::Length() accept a Value instead of an Object.
Upgrade to vanilla openssl 1.0.1c
NPN extras
android progs
jsse
small_records
cutthrough
sha1_armv4_large.patch
x509_hash_name_algorithm_change.patch
Disable UI
uninitialized memory patch ben 2c13cbbc0b43287dfb86aef91e402a0719363e11
empty_OPENSSL_cpuid_setup.patch
Replace symlinks by shims
refactored forms to create a new fields partial
Add queue album / queue song
Put support for Zuno
Add support for Slovenska Sporitelna (slsp.sk)
Update information about supported banks in README
Merge remote-tracking branch 'sochotnicky/master'

Conflicts:
	bank2qif.py
build shared libraries by default.
modified:   css/global.css
	new file:   images/auth-bg.png
App Downloads
Added p_hw_data to ssl_context for context specific hardware acceleration data
Fixed client certificate handling with TLS 1.2
Amended ChangeLog for client authentication fix
Made auth_mode as an command line option
Fixed typo
More expansive testing
Fixed dependency on POLARSSL_SHA4_C in ssl modules
Do not check sig on trust-ca (might not be top)
Updated for 1.2.2 release
Z-projects added
Update hqmf2js to use latest patientapi, hqmf-parser and handle negations
Support coded negation rationales
Fix autocompile force
Merge branch 'master' of https://github.com/posativ/acrylamid into develop
Merge pull request #49 from moschlar/develop

Fix autocompile force
Windows installer updates for 1.16.
Ensure backwards compatibility for GetStableLatestTransactionId()
Prevent corner-case core dump in rfree().

rfree() failed to cope with the case that pg_regcomp() had initialized the
regex_t struct but then failed to allocate any memory for re->re_guts (ie,
the first malloc call in pg_regcomp() failed).  It would try to touch the
guts struct anyway, and thus dump core.  This is a sufficiently narrow
corner case that it's not surprising it's never been seen in the field;
but still a bug is a bug, so patch all active branches.

Noted while investigating whether we need to call pg_regfree after a
failure return from pg_regcomp.  Other than this bug, it turns out we
don't, so adjust comments appropriately.
Fix broken mmap failure-detection code, and improve error message.

Per an observation by Thom Brown that my previous commit made an
overly large shmem allocation crash the server, on Linux.
Fix cross-type case in partial row matching for hashed subplans.

When hashing a subplan like "WHERE (a, b) NOT IN (SELECT x, y FROM ...)",
findPartialMatch() attempted to match rows using the hashtable's internal
equality operators, which of course are for x and y's datatypes.  What we
need to use are the potentially cross-type operators for a=x, b=y, etc.
Failure to do that leads to wrong answers or even crashes.  The scope for
problems is limited to cases where we have different types with compatible
hash functions (else we'd not be using a hashed subplan), but for example
int4 vs int8 can cause the problem.

Per bug #7597 from Bo Jensen.  This has been wrong since the hashed-subplan
code was written, so patch all the way back.
Fix bogus handling of $(X) (i.e., ".exe") in isolationtester Makefile.

I'm not sure why commit 1eb1dde049ccfffc42c80c2bcec14155c58bcc1f seems
to have made this start to fail on Cygwin when it never did before ---
but nonetheless, the coding was pretty bogus, and unlike the way we
handle $(X) anywhere else.  Per buildfarm.
Say ANALYZE, not VACUUM, in error message on analyze in hot standby.

Tomonaru Katsumata
Use sed to brutally remove the current RUBY bin/ dirs from $PATH.
Only shell-out to ruby once in chruby_use.
Sneakily support passing additional arguments to ruby.

* This will allow for --1.9 and -X1.9 options.
Combine the two sed expressions into one.
add luite's mirror to cabal/hackage download expression (for when hackage.haskell.org is down)
Patch ghc-paths to interact better with ghcWithPackages.

When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).

But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.

As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.

This should at least partially solve issue #213.
utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts

In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
ghc-paths: Fix patch to hopefully work with older GHCs.
Adding ext4 to vmTools. Otherwise, nixos build-vm fails with 'useBootLoader'.
fuse 2.9.2
Add unionfs-fuse
Add unionfs-fuse meta
Adding USB cameras to linux 3.7

Details changed since the 3.6 config to get this enabled.
Keep nixpkgs backwards-compatible at least 1 version
darktable: Update to 1.1.1
Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2
[Frame] Initial commit
Merge branch 'Point' into Frame
Point class is needed for Frame
[Frame] Added some accessor methods, added new methods to the interface.
[Point] Added operators
[Frame] Merge Point into Frame.
[View] Several code beautifications and moved console bar to the bottom of the window
[View] KeyHandler -> InputHandler
[View] Introduced (buggy) in- out- scaling of game camera.
[InputHandler] Ooops. I forgot to add InputHandler.h again
Merge branch 'dev' of github.com:pr061012/pr061012 into dev
[BasicDefines] Change base cam distance to a more suitable value.
voila mon travail pour le moment =)
marche-ce?
implemented the options using css
Revert "Mavenized the build."

This reverts commit e21abfbab8bdda8a3a27a6b2455d7044c38c5048.
bumped up Scala version
ignore more
package-private constructors for sensitive classes and some more
documentation
new package object with helper functions
new abstract bytecode ArgLoad to load args by index
less comments and more checks
type in rm
Revert "Revert "Mavenized the build.""

This reverts commit 8694fd3075328723358111935c6ab133705b53cb.

Resolved Conflicts in:

	.gitignore
bumpup maven version to match sbt version
first commit
home and login
include complete set of auth urls
logout url
no need for future url import
initial menu items
Merge branch 'feature/home' into develop
Merge branch 'master' of github.com:praekelt/motswadi
first commit
try zipball
drop develop branch
worker class rename
Added server side script
fix submit button height
Add packaging to Makefile
Removing moduling init file.
Packaging update.
Targets added for queues. However, local file access is a problem still...
Update lib/mixpanel/tracker/middleware.rb
Fixed modules download.
Merge branch 'master' into diego
Remove constants R2D & D2R
Add the rotation function
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap

Conflicts:
	projetp1/src/com/github/projetp1/Mathematics.java
Add rotation function
Ready for roll rotation

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
Merge branch 'diego'
Merge branch 'master' into skymap
* move to apt-get to handle 12.04 problems with aptitude
Attempted bug fix and updated README to mention bug
remove copy,paste,cut shortcuts
BF: DataHandler.addDataType no longer tries loop over unicode strings
Merge pull request #120 from williamhogman/upstream

BF: DataHandler.addDataType no longer tries loop over unicode strings
Ruby: bumping version past 0.0.5

I've lost the original repo which had 0.0.5 in, so I'm simply going to
skip over those versions now
CL-216:User should be able to override sessionUUID during object
instantiation
Merge branch 'CL-216'
Let auto-updater disable version check when no Internet connection
Empty list view is failing constantly, remove it (due to bug in android
compatibility package)
Update ext/revdev/revdev.c
Deprecate IP-based authentication

This will need to be made explicit in a future version, so it's good to
get people to stop using it if possible.
Add Selector terminus for file_content/file_metadata

This terminus is now the default, and encapsulates the behavior that was
previously in the IndirectionHooks. That is, we dynamically select the
terminus to use for a file request based on the key. However, for the
puppet master, we instead explicitly always use the FileServer terminus,
so that *all* requests for files from the master will go through
the file server. This ensures that we will never accidentally
serve local files on the puppet master.
Reject file requests containing ..
Fail more gracefully when finding module files if no file is specified

Previously this would just complain about trying to call `nil.split`.
Always use the local file_bucket on master

This fixes an issue where the master could be made to issue arbitrary
HTTPS requests through carefully constructed URLs. Now the master will
always use the file_bucket, whereas other applications retain their
behavior of dynamically selecting the source (rest or file) based on the
particular request.
Use head method to determine if file is in file bucket

This call was using find, but wasn't doing anything with the result,
only checking whether the file existed. Using head here is more
semantic and saves the trouble of reading the file if it does
exist.
Fix whitespace inside parentheses
Add specs for selector terminuses of file_{content,metadata}
Validate CSR CN and provided certname before signing

This adds a few new checks when signing CSRs, to validate the CN. First,
it must conform to a small set of characters, which are the printable
ASCII characters, except for '/' (because we store these in files). This
prevents attacks such as a CN "foo^H^H^Hbar", which appears as "bar" to
"puppet cert list".

The other check is that the certname for the SSL::Host that we think
we're signing must match the CN. This prevents a CSR with the CN "foo"
from being submitted as a CSR for "bar", which would cause it to appear
as "bar" to "puppet cert list", but to issue a certificate for "foo".
Don't allow the creation of SSL objects with invalid certnames

This ensures we catch invalid certnames earlier in the process, such as
when an agent is starting or making a certificate request, rather than
at the very last step of signing the request. This should make for
better error messages to the user.
Use "inspect" when listing certificates

This fixes an issue of `puppet cert list` potentially not accurately
depicting the actual certname of the certificate/request. For instance,
"foo^H^H^Hbar" would simply appear as "bar".
Tighten permissions on classfile, resourcefile, lastrunfile, and lastrunreport.
Merge branch 'file-server-2.7.17' into security_fixes_2.7.18
Merge branch 'deprecate-ip-authentication-2.7.17' into security_fixes_2.7.18
Merge branch 'clean-permissions-2.7.17' into security_fixes_2.7.18
Reject directory traversal in store report processor
Merge branch 'store-report-processor' into security_fixes_2.7.18
Update CHANGELOG lib/puppet.rb conf/redhat/puppet.spec for 2.7.18
Stable SW version, testing maximum sensor readout time now
remove bin/lib/include folders
update gitignore to ignore virtual folders
Adding jobs and django-debug-toolbar
Updating sponsors to separate module
implementation of directory services
typo fix (thanks to morel@irc.freenode.net)
Added BaseShifts to the admin
removed the location and timeperiod from shift type as it is attatched to a baseShift which already has that information
removed dashboard templatetag
Remove -nofloat from DFLAGS.
mark core.sys.posix.pthread as nothrow

- this also applies to the callback declarations
  thus the change in core.thread
Expose a thread_setThis() function in core.thread.
Mark some core.stdc.stdio functions pure.
Fix core.sys.windows.windows.LPCVOID

* also reformatted a bit
Merge pull request #242 from denis-sh/fix-LPCVOID

Fix core.sys.windows.windows.LPCVOID
Merge pull request #240 from alexrp/core-stdc-stdio-pure

Mark some core.stdc.stdio functions pure.
fix version specific IMAGEHLP_MODULE64 fields

- we don't use the additional fields and newer versions
  of dbghelp.dll are backwards compatible
remove unused moduleInfo
embedded CV info not loaded with explicit base address

- specifying the base address is only obligatory when
  loading external pdb files which we never do

- the CV function addresses should already have been relocated
use debug(PRINTF) for tracing
don't silently skip symbols without location info
check return value of SymInitialize
use the default module load mechanism

- passing fInvadeProcess=TRUE to SymInitialize loads symbols
  for all modules

- workaround CodeView bug
use the default symbol load paths

- uses same directories but SYSTEMROOT (C:\Windows)
  which didn't made any sense
unused process id
remove dead code
use stack buffer for symbol names

- fix SizeOfStruct = IMAGEHLP_SYMBOL64.sizeof
  according to StackWalk64 documentation
replace self-written format with snprintf
improve stack frame formatting
Deprecate the scheduleAsync methods.

The name is misleading, as it can be misconstrued to mean "a sync"
instead of properly understanding it as "an async"
Add API to get and set collar colors of wolves
turn off production debug
Add after_destroy callback
cleaner event handling
exporting trigger and on
Ensure gallery attribute is exported for Packs
wiki diary commit at 12-05-02 01:24:51
Fixed Assisiations.
Обновление tinymce
code to display create and add crops
Fixed Heroku's therubyracer long time deploy
add a local variable b:LatexBox_fold_parts
fixup for folding
Tagging version 0.2
Updating deploy script
Tagging version 0.2
Merging version 0.2 to master
s3 for pic upload and fb for registration
Replace #if 1 sections by local configuration #defines (tidy)
File devede_avconv_convert was missing in the repo. Adding now.
Provide appropriate path with error response when link target already exists
Add equal margin at top and bottom of layout
More networking rewrite,

Signed-off-by: Rob Caelers <robc@krandor.org>
fixed deadlock condition
pushing some initial fixes
Second step of major refactor of REST class.
Add _path suffix in all REST classes.
added didReceiveCompleteCollaborativePath: to PDRLogger protocol
added descriptions for payments, corrected mistakes
pom file for building example-seda with dependencies

  <!-- jboss.org config end -->
Minor change
Minor edits
Minor edits
Merge branch 'master' of github.com:/regunathb/Trooper
Update vim-ruby-minitest
PDFs of designs and sheets now correctly include the header and display name of scale variables if both are specified
updated README
refactored commits, comments & response time methods in github processor
refactored relevant word calculations in processor
refactored eventmachine code in github_handler (for brevity)
resolved integration bugs
updated pie chart dimensions to prevent overlap with graph; updated index view
updated relevant_words positioning
Merge pull request #24 from arn-e/arne_refactor

Refactored data processor, data handler module as well as CSS positioning (chart, relevant words)
Rebase Foundation
Added .pull-left and .pull-right (Bootstrap).
Created label.big for oversized labels.
Created .img-shadow to images - Usage: <div class="img-shadow circle"><img src="..." class="circle" /></div>
First README.md draft
Merge pull request #3 from restebanez/feature/readme-documentation

First README.md draft
Adding a PlayerViewController to hold all of our player controls.
Hooking up the outlets.
More outlet connections and porting of methods.
Now we're using our PlayerView as a subview! :D
Working implementation of the new subview structure.
Striking down comments.
Merge pull request #13 from revyver/playerview

PlayerView.
added LANG variables because the synchronized filenames in the log were garbled when cron started the script
Update src/locales/module.js

Changed file header text in src/locales/module.js.
Merge branch 'tests_frontend_localization' into my_test_branch
Remove unneeded call to test for gcc

This call was used at all times in earlier code, but in the cappuccino
master is now restricted to only being called if the OS is Darwin.
Updating my branch to reflect that.
b:icon - removed DivPanelRendererBase from inheritance - used RendererBase instead
ntree optimizations
add hex colors to my vim
Presave cache directory paths using presavedir
Merge pull request #83 from rishijain/master

fixed the count of users 
if user is not logged in, user is redirected to twitter authentication
Yeoman! (for real this time)
Removing 'X-Requested-With' from default headers.

fixes 1004
Tweaking testing.
Merged.
removed flask-principal
moved user code to main template
added idea model
Cleaned out dir. Ready to try in scala.
Unfinished prime factors kata
First passing test
Bowling kata with tests passing
Latests kata work
Move m4 macros into tree.
Add check.m4.
Detect required libraries.
New JS structure complete to the same level as first week sprint demo
config fix for gcc 4.7
First (new) release - DEV-1
filter undefined on constructor
Clearing notifications protects against signed out user. Added tests to user_controller#destroy, clear_notification,reset_password, update author, a little refactoring.
Remove hover-border on notifications
better attract mode
add switch monitoring to test display
added score display mode, optimized grouped layer, tweaked text layer
require 'rspec/expectations' to ensure that 'should' is defined
emacs.  sigh.
set NODE_PATH
fix the order of include paths

When oniguruma was installed on a system and located in the include path
of llvm, then the compile could brake. This happend on freebsd 9.0 with
oniguruma and llvm installed from ports.

This fix moves the inclusion of the paths after all libs are processed
so that these include paths are first.
Merge pull request #1726 from Gibheer/1732-include_path_fix

fix the order of include paths
Remove redundent certs
cleaning up verbose parse handling to be automatic when running httperf verbosly or passing verbose output
Merge branch 'grapher_handler' of github.com:rubyops/httperfrb into grapher_handler

Conflicts:
	RSPECOUT.md
	coverage/.resultset.json
	coverage/index.html
	doc/HTTPerf.html
	doc/HTTPerf/Parser.html
	doc/_index.html
	doc/file.README.html
	doc/index.html
	doc/method_list.html
	doc/top-level-namespace.html
ficed a minor bug, an automated solutions for 01_13 still needs to be addressed
DTD-based validation: support query pipelines.
highlight: Use only the last part of the query pipeline.
Better utf8-support
Update cookbook/index.md

tables
Revert work on invis - cleanup
updates, modularizations, and executable addition
packed and deployed to Rubygems
Decorator slides completed
Trivial simplification
Add build commands
WIP: remove types
WIP: mime-type comes back as string from webmachine, may be binary in other places, hmmm
WIP: convert to binary
Fresh
Clean
Login, Template, Start
Fix compiler warnings related to 'const'
TESTS: improve verify tests to detect/abort on opcode not supported furthter
jambu
set svn property.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324313 c90b9560-bf6c-de11-be94-00142212c4b1
some sharding support
Update assets/delete_file.c
Issue #3

MinSolver now has an origBounds field instead of a bounds field; changed
the names of several local variables for clarity as well.
updatin files and shiz
Added Lot Of CPU Governors & Tweaked Them
[refactor] code for better readaibility. [add] start on searching by contentDescription tag
Merge branch 'master' of github.com:samstewart/Hadaly
Fixed DB bug and bootstrapped Spork for testing
Removed utilitags inclusion
Merge branch 'master' of github.com:sandybox/gemsofcl
修改rake任务

修改只有入库图片才生成特征码
forcing the merge
Issue 1264: create unique index for filter_id, so no more duplicate filter counts can be created at database-level

I know, data munging in the migration, but it's for the good cause of
ensuring we don't have any duplicates when creating the index
Fix issue 3047 with font size increasing in landscape mode on iPod/iPhone
Fix for issue 3001 - added skip_before_filter
Issue 3065 - Rephrased text on Work Search
Issue 3072: error 500 on editing bookmark on deleted bookmarkable
Fix issue 2809 with long collection name in filters causing scrolling
Fix Issue 3078 with bookmarks navigation
Fix issue 3079 adding Mac keyboard instructions to fandoms indexes
Merge branch 'master' of git://github.com/otwcode/otwarchive
Committee-requested changes to the Support Form, with cleaner pull info.
Update db/migrate/20111122225340_add_comment_to_pseuds.rb
Fix issue 2724 with pseud list in sidebar skipped in keyboard navigating
Fix issue 2805 with invisible tab on blurb icons
Fix issue 2666 with items overflowing scrolling listboxes in IE7
Changed redirect to avoid 404 errors
Reverted change and added skip_before_filter instead
Committing TinyMCE config file
Issue 3081 link External Works to bookmarks on tag edit page
Remove background images for collection & pseud icons, change pseud icon default
Add map image
Add game logic

bear runs and jumps
tracks the state of a round via cvar
Clicks are working pretty well
Removed LEDtoggles and some rowbreaks
add errors message si dice requested is too big (for faces, dropped dice, rolled dice, multiplier, add and minus modifier)
etags-select: Fix keybindings to be friendly for terminal
quick-edit: Get rid of redundant keybinding
Change font-lock face
* Escape \n for translated strings.
* Moved WidgetBase functions around
* Fixed problems with ActiveEffectsWidget
* Made skyui.util.ColorFunctions which converts colours between rgbHex, rgb, hsl and hsv
* Added more settings for ActiveEffectsWidget to the config panel
* Updated ActiveEffectsWidget to support different orientations and grow directions
* Added resources for MCM logo as general welcome screen for the control panel.
* Properly centered skyui splash, modified some snow parameters.
* Settings manager now handles all item menus (+ container & barter).
* Added welcome screen to config panel.
* Implemented proper navigation between mod list and submenus.
* Added position params to LoadCustomContent.
* MultiColumnScrollingList now hides separators if the list is empty.
* Included bottombar.
* Moved InventoryDefines.as to Common/.
* Started implementing MappedButton. It will look like CrossPlatformButtons but show the correct button art.
Merge branch 'master' of https://github.com/schlangster/skyui into HUDWidgets
* Removed unused symbols from mcm_splash.fla
* Updated all *.fla's to use fonts in Resources/gfxfontlib.fla
* Removed unnecessary SetInfoText in SKI_ConfigMenu.psc
* Added Space to buttonArt.fla
* Added 360_Back to buttonArt.fla
* Added Caps to buttonArt.fla
* Updated ActiveEffects config options
* Fixed minor bug in ConfigPanel - infoText didn't display multiple lines properly
Merge branch 'HUDWidgets' of https://github.com/schlangster/skyui

Conflicts:
	src/Common/BottomBar.as
	src/Common/bottombar.fla
	src/Common/skyui/components/MappedButton.as
	src/ItemMenus/magicmenu.fla
	src/ModConfigPanel/ConfigPanel.as
	src/ModConfigPanel/configpanel.fla
	src/ModConfigPanel/mcm_splash.fla
	src/ModConfigPanel/skyui_splash.fla
Updated documentation and moved Tag and ArrayIterator to new packages
Fixed wrong package occurring by merge and added derived to thread safe and immutable state of array collection since the data array is not copied
ignore obj and lib files
Simplier way to use Pretty Print for debugging
Improved way of finding the backup filepath

This will work regardless of whether the user inputs the trailing slash
on the directory name input argument or not. Makes it a bit less
fragile.
Yasa, Zaku és Scor szavazatai
updated date display on user signup page
added rs support
trying to fix JMX Jmx naming issue again
trying to fix JMX Jmx naming issue again
stubbing readme
new data injector
forced sync mode on element method
Working on comment blocks.

http://stackoverflow.com/questions/1676632/whats-a-quick-way-to-comment-uncomment-lines-in-vim

* I changed the command to leader.
Fixed error in comment block code.
초기 작업중..
JPM: introducing x-count argument that results in 'recordsRemaining' attribute on resumptionToken element
TS/JPM: suppressing deprecation warning in test output
TS/JPM: yield Yield when counting recordsRemaining (x-count)
Binding for copy all buffer function
Point download link in README to SourceForge.

Github no more provides hosting for downloads. So switching over
to SourceForge.net.
working on the carnets input.
turned off zsh autocomplete on one tab click
ReportView
ReportView
OutputFormatForm
modified \cs mapping
Empty picker values doens't crash workspace
combine items in the cart

-New migration created to combine items in the cart and executed
-:product and :quantity added to attr_accessible in line_item mode
down method for combine_items_in_cart mig
redirect bad cart id to home page
destroy cart button

also...
-removed notice: 'Line item was successfully created.' from
line_item_controller create
-updated the functional test for destroy method
updated the cart show view
uniform APIs to use 'base' to identify its parent
more words about why rssminer in landing page
reverse proxy url
delete crawler; using the new event driven HTTP client I write
style webkit scrollbar
chrome extension to add subscription
fix 2 errors: vote is renamed to vote_user, footer height is 0 when hidden
script to rebuild lucene index
refactoring NaiveBayes
cleanup and (maybe excessive) commentary.
Removed the inline CSS.
vignette now uses 'listings' package which provides line wrapping
WIP: Update svn commit
deleted conflicted files AGAIN
Change configurations for tagbar.
Raw French translation
Merge pull request #1 from rtripault/translation-fr

Raw French translation
ZK Bind will now accept a List from a ViewModel. 
comment was incorrect. 
zk6 refresh of the passive screen example to SelectorComposer
zk6 only refresh
update to spring-data-jpa
pass through of the documentation
upgrade to zk6.0.1
generic event handler on the Presenter. 
onSelect=#list
reworked the Supervising Controller to have a dumb bindmodel. 
default constructors are not needed. 
make ViewModel consistent in using @WireVariable
bump to ZK6.0.1
touch of docs
readme wrapping
rename applicationmodel.zul to presentationmodel.zul
ref not working test page from forum discussion
split out the converter into a seperate class.
unused import
touch
PkgCache needs to be made stricter, functions reading package information need to evaluate right away or any protection the monad provides is for nothing.
Suppression de la traduction pour en_EN.
accept admin cancels
keys are cached in MySQL
switch MysqlBackend to Mysql2 with connection pool
switch WordpressBackend to Mysql2 (TODO: connection pool)
look for BACKENDS in the right place
new mail lib takes slightly different params
improve references checker
switch all to Mysql2 with ConnectionPool
c6b7c9e Q:
Starting to get the airframes together though they don't build yet. Maybe someone else with more experience can assist. ;-) either that or I'll RTFM and get them together in time.
Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test
The Lisa/L b2_v1.2 rotorcraft airframe now builds.
Updating the conf.xml.example file so that the build works.
Moving aside the current conf/conf.xml so that the example conf.xml can be copied in place and used to build against.
Adding the hardware test config to the end of the current example configs.
Adding the option to target the upload to a specific board by board serial number.
 i.e. make AIRCRAFT=LisaLv11_Booz2v12_RC BOARD_SERIAL=LISA000156 clean_ac ap.compile ap.upload
Correcting when the target board serial options should be added to the command line.
Merging from the dev branch.
Started adding a Perl test framework. Need to work out how to print JUnit test results though...
Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test
Some basic tests to check that Paparazzi compiled.
Some tests that check that the compile of the airframe config works as well as the upload of that airframe to a target board.
Corrected a regex and added a couple of ignore items
Adding JUnit result output

The JUnit results can be added by specifying JUNIT=1 from the make
command line.

This is important as the Bamboo server can read JUnit results and
include them in the build reports.

This requires that the Perl module TAP::Formatter::JUnit is installed
on the host that the command is run on.
The JUnit results are created under tests/results and have the name
ABC.junit.xml
Adding the tests/results directory to be ignored.

We never want to commit anything from the tests/results/ directory.
A couple of minor changes to make building easier.
Building all examples

Removed the early prototype of the tests.
Added the building of all example aircraft targets.
Adding the XML::Simple perl module

Adding the XML::Simple perl module into the tests/lib directory so that
normal users don't need to install it to run the tests.

Reformatted the conf/conf.xml.example file to not all be on single
lines for each config since this is now not required as we're parsing
the XML.
Adding more perl modules

Adding more support modules that are needed by XML::Simple to read the
conf/conf.xml.example.
Adding these files into the repository means that users don't need to
install them on their computers.
Chaning how the verbosity of the tests is set.
Added safegard for mb_strpos for when offset is longer than string
- started creation of SQLBuilder
- enhanced select filter by enabling enum option list
Added IR for array declaration and array initialization, fixed IR for if