labofsahil/github-event-dataset-2012 huggingface dataset:
STOR-84 reserve checksum entry for ZIO_CHECKSUM_SHA256_MAC
OS-954 add vmxnet driver to illumos
OS-993 when creating zone, zfs snapshot && zfs clone leave empty dataset
OS-1011 mdb needs ::printf
OS-986 remove many default privs from KVM VMs that are unneeded.
Merge git.joyent.com:illumos-joyent
OS-986 remove more unneeded privs.
OS-978 hyperlofs
OS-978 hyperlofs [fix multiple adds to same dir]
OS-1024 sysconfig(_CONFIG_AVPHYS_PAGES) extremely slow inside zones
OS-969 want to perturb vnics
OS-997 net_* and hook_* man pages are wrong
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>
Reviewed by: Brendan Gregg <brendan.gregg@joyent.com>
1971 i86 kernel should be more careful when casting pointers
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
1977 zfs allow arguments not parsed correctly after pyzfs removal
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
1988 sa_to_str can pass junk to mdb_nhconvert
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
1946 incorrect formatting when listing output of multiple pools with zpool iostat -v
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
1978 iPsGetSetStmfProp is missing some brackets
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
1848 sshd always tries to resolve client's IP to hostname
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Dan Kruchinin <dkruchinin@acm.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
1993 typo bug in stmfadm.c:createHostGroupFunc()
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Bayard Bell <buffer.g.overflow@gmail.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
1992 sharemgr show -P [nfs|smb] doesn't work for shared datasets
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
1982 Make rpcbind_getaddr() work with all versions of rpcbind protocol
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
Installed node.js & socket.io

and made a few tests
gestion mode DEV/SYNC via bool

var modeSync + filtrage de la team grise (bats) lors du refresh
Blockage seulement du move de la souris pendant l'exécution - Reste à bloquer les boxWidgets
Catch bug assignation when no box selected
Initial commit (fo reals yo)
client type radio buttons
Removed .DS_Store files...
remote *.DPack
some tweaks after gnome-session-manager removal

- add battery widget
- fix pomodoro notifications
- add screensaver
Implemented devise and cancan, added a rudimentary appointments table
Implemented user CR(U)D
Full user CRUD implemented
Merge pull request #6 from njtechnologies/richard

Richard
Fix a random suggestion from a style checker
Fix for issue #1819 where TransportClient (sniff) fails to reconnect to nodes once removed if all nodes are removed
fix case in javadoc of the query fuzzy_like_this_field
ARQUIDEAS-770 # Flag Highlight in Newsletter for Contest node page
Add a new rewrite rule for /board.xml
updated (old) docs
Added virtual destructor to base classes
additional stuff for users
Fixes for mouse selection of arcs.
Ziyaretçi defteri anasayfası ve testi eklendi.
Further html_safe addition to app/, being less conservative in the face of html_safe
THING='(<%=|link_to).*\.title\>'
sed -i -E "/$THING/{/title\.html_safe/!s/($THING)/\1.html_safe/}"
catching error during fixing of prj file
updated Karl and Colin's details
added footer nav
made nav styling generic
Merge branch 'master' of github.com:openhealthcare/nhsbugs
presenters link affiche_today знает ссылки на все типы мероприятий
rf iconize info
Завершающие штрихи для поиска :princess:
version 1.0.1 seeker theme
Merge pull request #528 from ossreleasefeed/bugzilla-400-500-errors-732244

remove duplicates from array and batch bugzilla api calls fixes bug 732244
bug749019 - new crontabber 1.1 with automatic backfill, r=twobraids
(no bug) schema dump for Socorro 9 release
Merge pull request #591 from rhelmer/master

(no bug) schema dump for Socorro 9 release
bug 749462 - add crontabber configs, in new top-level config dir
Merge pull request #580 from ossreleasefeed/url-by-sig-front-end-550538

making urls by sig available to logged in users fixes bug 550538
bug664501 - buzilla as a crontabber app, r=twobraids
Merge pull request #592 from rhelmer/bug749462-crontabber-puppet

bug 749462 - add crontabber configs, in new top-level config dir
bug 749462 - docs for crontabber on new installs
Merge pull request #593 from rhelmer/bug749462-crontabber-puppet

bug 749462 - docs for crontabber on new installs
use renamed PostgresCronApp and also use cursor.callproc for SPs
bug 751298 - add crontabber job for nightly builds
Merge pull request #594 from rhelmer/bug751298-nightly_builds

Bug751298 nightly builds
update requirements to new version, enable the processors incrementor
Merge pull request #595 from Lonnen/747562-statsd-back

update requirements to new version, enable the processors incrementor
bug 751298 - run for yesterday not today
Merge pull request #596 from rhelmer/bug751298-nightly_builds

bug 751298 - run for yesterday not today
added tab and form to branch data sources for adding new products fixes bug 755230
RM works clientside with directory tree in /client folder
Merge branch 'develop'
Changes to readme...
- Spelling mistake + a test
search: First working populated search.
blank test for travis
更新

Signed-off-by: 潘何增 <panhezeng@gmail.com>
Change terms
Supports dependency tracking for imported Sass files. (i.e. updates to imported files causes recompilation of main file)
Updated version to 0.1.1, updated Play to 2.0.2
Fixed broken regexp in dependency tracking, cleaned up SassPlugin a bit
Fixed tests after adding -l option to sass, added dependencies tests
Updated to use play 2.0.3
Changed README to reflect 0.1.1 release
Add resolver and publishing repository
Update Readme with Patience repo
Fix indentation (using spaces, not tabs)
attempting to separate different languages into folders
Merge branch 'jellybean-release' of https://github.com/pbeeler/Kernel-Grouper into jb-wip
bionic: Add ARMv7 optimized string handling routines

Add ARMv7 - and especially Cortex-A9 - optimized string handling
routines based on the versions found in the cortex-strings library.

Change-Id: I497075bea5b82aef8989625bdec512029676fe7f
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Signed-off-by: Paul Beeler <sparksco@gmail.com>

bionic: Add workarounds for current compilers

With current compilers, we're getting "this function cannot be inlined"
errors on vsnprintf and strlcpy because the always_inline attribute is
set.

Before marking this a "fix" instead of a "workaround", we should figure
out why the functions can't be inlined.

Change-Id: Id6c5464defafb3f9044c102d32a57e70d760b05d
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Signed-off-by: Paul Beeler <sparksco@gmail.com>

Fix build

Add optimized version of memcpy for Cortex A9

Adds new code to memcpy function, optimized for Cortex A9.
Adds new ARM-only loop, for operations where source and
destination are aligned.

Copyright (C) ST-Ericsson SA 2010

Modified neon implementation to fit Cortex A9 cache line size,
for those running 32 bytes L2 cache line size.
Also split the implementation in aligned and unaligned access,
for those that allows unaligned memory access with Neon.
For totally aligned operations, arm-only code is used.

Change-Id: I95ebf6164cd6486b12a7e3e98e369db21e7e18d2
Author: Henrik Smiding henrik.smiding@stericsson.com for ST-Ericsson.
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Signed-off-by: Paul Beeler <sparksco@gmail.com>

bionic: Make use of new memcpy, tweak settings

The new memcpy() is slightly faster than the cortex-strings version,
and fixes the Galaxy Nexus camera issue.

Change-Id: Ie65d14992a399e9bc2709a3d710d52b5b1a62e87
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Signed-off-by: Paul Beeler <sparksco@gmail.com>

Fix build #2
Creatief met getallen. Mid+Def iets hoger. Een magic number om de aanval gelijk aan HO te trekken (lager)
Hey peter, This should make your day.
re-add necessary SiteSettings object
Always display css, since mc no longer knows of tiers.
Added a little gravity toward the center
modified:   ../env/.aspell.en.pws
modified:   METADATA
renamed:    blogit/gaQuickIntro.tex -> gabook/gaQuickIntro.tex
renamed:    blogit/gaQuickIntroFig1.pdf -> gabook/gaQuickIntroFig1.pdf
renamed:    blogit/gaQuickIntroFig1.pdf_tex -> gabook/gaQuickIntroFig1.pdf_tex
renamed:    blogit/gaQuickIntroFig2.pdf -> gabook/gaQuickIntroFig2.pdf
renamed:    blogit/gaQuickIntroFig2.pdf_tex -> gabook/gaQuickIntroFig2.pdf_tex
modified:   gabook/main.tex
modified:   gabook/make.dep
modified:   continuumMidtermReflection.tex
new file:   continuumMidtermReflectionFigQ1.png
modified:   ../myrefs.bib
modified:   ../phy454/continuumL9.tex
modified:   ../../env/.aspell.en.prepl
modified:   ../../env/.aspell.en.pws
modified:   ../blogit/continuumMidtermReflection.tex
modified:   notes/phy485/modernOpticsProblemSet2Problem2.tex
Adding download links for Python and Django.
Removed actual files, trying to submodule other repo
Fix spinner bug, make it hide properly
Adjust login form css
Change header navigation depending on logged in status
Remove some old commented code
Redirect logged in users when they are on pages they shouldnt
Merge branch 'home'
Add drog and drop functionality over the googlemap + change author, ^^ woops
Merge branch 'home'
Changed sync method to match with other mongoose methods
Added frontend packages
More work on layout, tweaking styles for different browser widths
sync-26: implement Fuse interface
removed ending line spaces and change versions from 1.17 to 1.18
progressive work on fixing syntax errors.
Alternate plots
Changed ContactManager Interface
Merge branch 'master' of https://github.com/philluminator/batlands.git

Conflicts:
	backend/src/com/batlands/controller/ContactManager.java
	backend/src/com/batlands/interfaces/IContactManager.java
added contact bean
goblin sprites, Troll class
troll
added schematic and Bill of Materials
Add mincer multitask
refined the installDir button
- pl, ibus version
wicked has test fixes in combination with chameleon
Update checkouts.cfg

checkout plone.app.contentrules
fix some issue after changing some values in database's schema
Merge pull request #34 from srogier/master

fix some issues after changing some values in database's schema
Now pulling map info from DB!
Set rate, bucket_size, max_concurrent_requests for queue

Only use the default queue
Add timeout functionality.

 * Now exits the program if either no logs have been seen
   for the past N seconds (-t <N>), or if N seconds
   have elapsed (-t <N> -x).

Change-Id: I09eec51dd57ccb44f4e09d339d2664e91795d8fe
Only output stack trace on debug, use caller

Thanks @PragTob
Can cut/paste item with children to rearrange
Initalize in Bomberman.Java ueberarbeitet. Ist nun per Schleife eingelesen und spart etwa 200 Zeilen Code
BomberManMove ausgelagert
Spielfigur von png auf gif geandert und minibug gefixt
Merge branch 'master' of github.com:propra12-orga/gruppe23
Javadoc.

finnished bomberman.game-package
alle texte in englisch
Ausgabe xml entfernt
Bomben Klasse SoundManager entfernt und stattdessen player Aufruf um audio abzuspielen
repush dateien gehen auf windows verloren
Add jquery 1.8 to unit tests
small corrections to test_buffers.py
renamed classes, tests OK
Readded config and deleted ee3
fix command for cert deletion in troubleshooting guide
Merge pull request #111 from dhgwilliam/master

fix command to delete certs in Troubleshooting Guide
small word change
Merge remote-tracking branch 'upstream/master'
Add forgotten directories
Remove Baby Logbook post
Whoops, undid date pretty-printing
The client now can find out if a model added to the graphics engine was actually added to the quad tree
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GraphicsEngine/World.cpp
add selection shift
multiple faster by number of touches
monitoring -> supervision
More prints II
A little filtering
<Rahul>: fixing download select box
Update emacs/emacs

Use two spaces indentation for JavaScript
add missing files

add missing files
add missing files
Revert "add missing files"

This reverts commit 10a583ff9d7897045a104b3db3fa8f5832868bf3.
add missing files2
add missing file
change some default config
Added some comments

Might need to reconsider JSON formatting
Twig_View
Fix typo in [#24839]
Correcting changelog
 # [#28287] Fix some differences between platform and cms. Backport CSS
changes. Thanks Rouven
 [#28384] Duplicate 'home' in breadcrumbs in a multi-language site.
Thanks Nuno.
[#28336] e-strict error in com_messages
Fix hard-coded version number in system test
datatable for market
v1.0.1 in progress
solucionado problema con reuso de cells
Tagit bort metoden för att sätta level och kommer istället använda GameControl-klassen till att hämta aktuell level.
started making a sword attack that triggers whenever an enemy is in range, but it goes off if youre not facing an enemy even
MemoryModule: Minor cleanup, variable name changes and updated javadoc
fonctions d'affichage
ajout boucher
labs
mise à jour
maj
fix bug: execution de plusieurs scripts JS
refactoring
Added a comment about an attempt to use the generated ecore model as
existing ecore model.
Index.html Updates
fixed thumbnail of dark wood theme
Merge branch 'release/v0.4.2'
Add post about MoreApps
Initial Sync.

Upload
ht_remove should return NULL if item not found
Nuevo proyecto de tpv básico
Update `bin/serve` with a she-bang line so it can be executed in the command line (as per the docs).
Merge pull request #18 from clowder/patch-1

Update `bin/serve` with a she-bang line
Added 'use strict'; to the top of the file.
Removed leftover console.log() calls.
[ADC] Changed the test procedure to read two channels via interrupt and single channel mode.
Lightened code blocks.
added support for duplicate data-reveal-target selector values
generalize clean target
add git special files
test a non-boring filename
unregister datafiles
Derière maj
Pix_Table_Search->after(), before() add $included argument
Add unaction to layout
Update for repo D:\MoCCaRepo
long press to jump 10
Adding keystone_plugin for collectd
moving keystone::server monitoring into the keystone::server-monitoring
Merge pull request #26 from galstrom21/master

moving monitoring from keystone::server to keystone::server-monitoring
adding collectd-graphite dep
Merge pull request #27 from galstrom21/master

adding collectd-graphite dep
Implementing enable_collectd and enable_monit toggles
Merge pull request #28 from galstrom21/master

Implementing enable_collectd and enable_monit toggles
fixing typo
Merge pull request #29 from galstrom21/master

Fixing a typo
Update the version number before publishing
Initial revision

Draws missiles and bullets, constantly spawning.
added kinnect verison of airplane for controls that are via processing > kinect> nodejs
Jekyll bootstrap copied
fixed #8 - aka "No session selected"
Fix mistakes on samples
Moved dashboard icons in.
linked user names to their profiles and made email addresses link to sending an email to that address
Fixed auth to work with keystone.

* Was incorrectly looking for X_TENANT instead of X-Tenant-Id.
Merge pull request #16 from TimSimpsonR/fix_tenant_id

Fixed auth to work with keystone.
SAK-22863 set IS_SOFTLY_DELETED to 0 where null


git-svn-id: https://source.sakaiproject.org/svn/reference/trunk@115661 66ffb92e-73f9-0310-93c1-f5514f145a0a
Adjusted search to use a LEFT JOIN.
Used the wrong timestamp in the votes search query.
STAY FIXED
Updated with styling
convert values to float
version bumpup
#356725 splitting coffee
Added patch_form_preprocessor.
Fixes Typos in the Tour
Merge pull request #80 from dgruntz/master

Formatting in the Tour / Jekyll under Windows
publish by okapies
Merge branch 'master' of github.com:scalajp/effectivescala
Merge branch 'master' of https://github.com/twitter/effectivescala
apply trivial changes in the original.
translate section of 'Offer/Broker'.
fix typo in collections intro

"readbly" should be "readably"
Merge pull request #14 from benolee/patch-1

fix typo in collections intro
Merge pull request #13 from scalajp/offerBroker

update Japanese edition.
prenton, meta-serif
Merge branch 'master' of https://github.com/twitter/effectivescala
standarize images and footnotes
Optimierung der Bilder, Plugin zum Setzen der HTTP-Header eingebaut
Optimierung der Bilder, Plugin zum Setzen der HTTP-Header eingebaut
Added two new activitys for setting time and day
Fix problem after homebrew install and add binding for pbcopy to push tmux buffer to clipboard
Updated package.json and removed CoffeeScript dependency
Merge branch 'master' of https://github.com/scryptonite/nbt-stream
Delete docs/
passing on jruby for now
Tweaks to support user entered station list
Added support for additional NDBC observed properties
Rename of EV0 files
Remove dependance on EV_BASE_URL
Updated Readme
Semi fix for even.pageX bug in EV2
Fix incorrectly named file
Add controls array to EV0 and EV2, fix class names in EV0
Fix spacing in EV2 parameter modal
EV0: Change station input to textarea
replacing product index page with search page
Merge branch 'master' of github.com:sebriois/Order-Manager
using theirs
added xls export to product page
some lowercase bold symbols fixed: m, sha, scha, etc
start stats post
Namespace, safety switch, and big warning sign.

Add a warning with an explanation and example as to why this is
dangerous.
Move Cellulate into Celluloid namespace.
Make :cellulate private.
Update example.
Added pg for heroku
Installing gem pg
Merge remote-tracking branch 'origin/master'
MapWrapperにMapを引数に取るzipメソッドを追加
zipメソッドのテストを追加
изменения вкладки "Соединение"
Added names to top. Did minimal cleanup.
added created field in notebook
moved API_Request::get_auth_key() to API_Util::generate_auth_key()
API_Model_ORM->edit() properly 404's if it doesn't find match
action_put() method can add or edit (if id was passed)
added comment
Controller_API_Model handles response and API_Model deals solely with models (no more setting response)
Water fix *again*
fix inserting from_source deps into result array

fix incorrect use of 'call' instead of 'apply' since deps is an array
deduplicate requires in source file

No need to list the same require twice in the dependencies if it is the
same file. The same name will result in the same file from any
given source so just deduplicate the requires array.
Update spaceport.json
0.1.5
Credits uitbetalen
Add of a thread for messages treatment to avoid dead-lock when the
number of trains is big
Add comments and empty lines possibility in addr_file
Move prototype panel 401 out of the way; it must become a later one.
Panels 401-403: Jz press buttons.
Ajout des fichier "getap-base.sql" et "getap-data.sql" dans le dossier
"ressources" du projet.
Merge branch 'master' of https://github.com:443/sio-melun/prolog-getap.git
fix version parser
- added sources to skyglass-core repository
- added skyglass-dao and skyglass-core-web projects
Removed facebook_js_sdk.js
Semi-transparent unlocked patches
fixed bug causes by patches with no background color. These patches have an
empty CData member and this needs to be checked before interpolating the new CDAta
renamed all methods to conform to camelCaseNames, additionally the ability to add an overlay over the existing axes has been added to make the axes lines look hand drawn, finally if the font "Comic Sans MS" is present is available to matlab then the axes tick labels will be written in this font
Merge branch 'master' of github.com:slayton/matlab-xkcdify
bitkey moved to standalone repository "bitkeylib-python"
P3K : Replaced / by //
P3K : Refactored test cases to use setUp
P3K: print back compatible with python2.6-7 with  __future__ import
initial upload - this master is live @ www.count2three.de
텍스트 출력 수정 외 다수
- 특수문자 처리시 무한루프 빠지는 문제 해결
- viewtext페이지 수정
- 텍스트 코드도 함께 출력하도록 변경
- 번역윈도우 입력창 추가
style.css 추가
Solve exercise 1.19: Reverse each line of input
Use project name (gflags) within include guards to avoid conflict with gperftools as reported by chen3feng (issue #62, http://code.google.com/p/gflags/issues/detail?id=62).

git-svn-id: http://gflags.googlecode.com/svn/trunk@78 6586e3c6-dcc4-952a-343f-ff74eb82781d
Add "build/" subdirectory to ignore list.

git-svn-id: http://gflags.googlecode.com/svn/trunk@79 6586e3c6-dcc4-952a-343f-ff74eb82781d
separated actionsheet outside of carousel
[TIMOB-10773]Removing conditional check.
Steffen contributed
parallel coordinate plot and grain map included
Initial commit
Установил WordPress
Fixes Feeds with no links
1.2.1: bug fixes

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Simplify allEqual
Added starting point for bronxplot.R
removed unnecessary #strip method
admin fix nginx
added doc uploads to administration page
add item example
fileの整理
encoding utf-8
ログに出るようにした。
forceretunfix
added support for named cache testing and uploaded test files
removed duplciated dir
method name changes
Level2 intelligence, reading topology change and update connection pool
Implement table row separator line for browsers without nth-child support
Invert media query for tab content, to give better support for IE6/7
if f.image_file_name?
ラベル名→アドレス オペランドのアドレスをラベルに置き換える
Testing some new stuff. Dropped scripting support
Updated addresses for Tibia 9.61.
Removed read-only and read-write packets. Added a PacketBuilder and PacketReader instead. Still needs a lot of testing though. Also removed unused plugins.
A lot of changes. Updated addresses to Tibia 9.63. DetourManager uses callbacks instead of signals and slots, to speed things up. Added an UIManagerInterface that allows plugins to add stuff to the user interface.
Added minimap renderer. Still need to add level switching and stuff.
Fixed issue #3. Using XPending instead of XNextEvent.
Fixed width issue of the help, now using max-width
Lightbox (bugid 36680) : update getShareCodes() in LightboxController

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58690 e846bd91-c042-42a7-a218-4b65e2c1904d
Cleaned up code. Put in comments. IMP: Put in a UNS queue for the notification worker to listen to
Patched http
Poprawka w auth - brak nawiasu linia 174
Release 2.3.1RC3
Added ™ to transliterations
Merge pull request #1526 from designermonkey/transliterations

Added ™ to transliterations. Fixes #1524
PTlang for plugin twitter
add autoload pragma
initial repl implementation
imprement imenu
add shop animals kusochki
Update website.
Removing old screenshots from readme.
Show a warning when using Windows
Merge pull request #10 from puentesarrin/master

Show a warning when using Windows
Rename group to agg_group so that we don't break functions that depend on old behavior

Fix for issue #9
Updates

Added current database to shell prompt
Query's verbose output, index use, and more indicator use one line
Re-enable verbose mode by default
Minor readme update
added gavg function
Updating readme -- no windows or < 2.2 support
fix confusing error message

daemon version is checked, not the version of the shell
Merge pull request #14 from bwaldvogel/patch-1

fix confusing error message
moving examples to wiki
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mongo_hacker.js
reverting to defaults for prompt
Fix bug in clojure-find-ns
Add support for multiple styles of test file naming in clojure-jump-to-test
updated with pg
updated
updated
update
updated
update
added bootstrap
added simple form
added schedule stuff
extract a way to parse ldap reuslt
lets see if this fixes it again
Updated README for rails

Changed rails install guide so it will work for threadsafe apps too
Update to latest version of modules and patches
Uncomment AWS_LOCATION to be used to S3.
Fix segmentation fault for undefined methods under 1.9
Removed prior on mu from colouredWBtest.xml
Adds StaticArray auth adapter, for testing purposes only
adding to .bashrc
spelling errors and removal of BS code.
My Yummy Recipes add table display
My Yummy Recipes add table display
add sample thumbs
Adding Mail database vaccum alias.
Created build targets for the Chinese Networks

well... for some of them at least
This version hide password when you input it.
Add utility constrain_pitch method.
Rename constrain_pitch.
Perldoc L<> fixups and standardizations.
Rough sketch of Nginx & FPM based module
Whitespace
Add drush and cron
Progress
Doesn't break a puppet run

But that's about all it does.
Same ::drush as in master

Which means adding ::params back in too.
Tweak cron
Move nginx-centric code into nginx module

This should make the nginx branch and master branch compatible. Which is to say

    include drupal

is a no-op.
Nginx configuration paths, etc.
Seems to be working
Generate Nginx vhosts to do hostname redirects
Drupal cron jobs should be quiet by default
Set PHP-FPM memory limit to 96MB
Support both $path and $root in drupal::cron

This attempts to work around my own stupidity in using $root in one
branch and $path in another. Hopefully this will support both legacy
and new nodes using the drupal module.
Add comments
Fix Modulefile
Add support for HTTP authentication
Support SSL in the nginx configuration
Split SSL params for nginx
Merge branch 'nginx' into merging

Conflicts:
	manifests/cron.pp
	manifests/drush.pp
	manifests/params.pp
getTablelist & initialize device APIs completed
notification added, date picker fixed
drop down calendar fixed
state on save displayed to user
state on save displayed to user
Merge branch 'master' of github.com:tiefenauer/istudybooks
update assets version
add backbone tabs subview
subclass tabs view from BaseView; fix bugs
add day and week options to Single.grouped scope
change chart to date based one (allows for grouping by day, week and month)
removed bottom scroller
bug fix
hope so
Add skorffman credit
open module : migrate module corrections 3
del mass
Fix dependency error.
Unlike original komoding extension, this one contains the git commands on document context menu
Start implementing JSON Object file format.

This will allow relocatable object code.
Add 'optimist' node module

Used for easy argument parsing
add bootstrap, csv writer
remove hard-coded None
cleanliness mapping
insert codes as a comment
Release v0.4.0.
Bump version number to 0.4.0-git.
media-gfx/exquisite: update to follow the release of 1.0
Updated activity scheme and improved services
Work so far

Basic board being drawn, skybox, and pieces
Pieces (GLUT shapes) are drawn based on state of board
Put in a basic spectator system, untested, likely buggy, and requires
cleanup. Updated version number to 0.7.
Got rid of spectators on finished games.
removed active admin and devise, not necessary
removed unneeded render template methods
Make 'my cart' link live in nav

[#40820323]
Add back in tag <r:layoutResources/> that was accidentally overwritten by another checkin.
remove simone
handling multiple models formular Sprache erfassen
Added InspectorReference

InspectorReference is for CCNode subclasses that need a reference to
the owner or document root.
Added DXGridView
make steam to use my default terminal instead of xterm, because I have no xterm and xterm dep for me is 3 additional packages I don't need
README update; new testdep: media-libs/jasper
remove old branches
steam-installer: update pkg_postinst information
promoted libtxc_dxtn dependency for Intel systems
new testdeps
First set of updates for 2nd UI rewrite
Quick bugfix (ln 189)
Kirjoitettu READMEen lyhyt kuvaus.
Lisätty simulaatioon testejä.
Fixing bug for "shared with" display
added mutex lock
Merge pull request #1 from eugsadhu/master

added mutex lock
added setup for phone number 1-4 ch 28
added the actual phone call ch 28
Templates

Collected templates
subject_level changed

- Moved $sysconf['subject_level'] from ifram_topic.php to sysconfig.php
- Made it translatable
- Added it in pop_topic.php
Added field Subtitle and Volume to biblio in DB

It should at least be possible to add a volume number for a series.
Finally a title should possibly belong to mor than one series with
different series counting (but this requires a new series table with an
n:m relationship to biblio).
Updated german translation
Ups the ammo to 400.
Update module/Application/src/Application/Controller/IndexController.php

Removed debugging statements and put some result var dumps
leaky global
build
refractored custom element
pseudo mobile devices support
Add CoreTiming to save states.

I hope DoLinkedList works, seems like it should.
update as of 12-12-15
Added Christine's git status line
Removed spellchecking in Lectures and PersonSearch. No other occurences
found
Merge branch 'master' of https://github.com/vasylja/new-campus-app.git
Remvoed HttpErrorResponse class. Using status_codes
third modification on layout
Bug 797277 - Part 4/5: Android implementation
Bug 797277 - Part 5/5: test cases
debug
Atualização 08/10/2012 - Novas classes
Version 7.0

NF: Added support for Outlook 2010.

NF: Added documentation on how to self sign the Outlook Vim macro so that security settings do not have to change in Outlook to use the macro.  Changing these settings are not possible in some companies.
edit contact file added
.gitignore updated
AjaxComponentScrollEventBehavior and AjaxPageScrollEventBehavior added with corresponding examples
removed timeinMillis frvar from Home.java
upload to s3
Merge branch 'master' of github.com:virtuallight/greenroom

* 'master' of github.com:virtuallight/greenroom:
  attaching and listing outfits for logged in users

Conflicts:
	greenroom/apps/outfit/views.py
Added option for making a user moderator
views,lab prescriptions and reports
More syntax improvements
Updated README and CHANGELOG
snuddlehorse wandering around, exit works
feed the horses
ignore text/html
update version to 0.1.1
zsh artifact
Implemented unused span remover
added many more meta informations ... cleanup content
Update the style of UPDATE methods
Merged from 4.0-stable: bdedf2288
jQuery in cart pages
modified _info
modified fare
add changpassword
Checkout in place for deleteing.
Merge branch 'master' of github.com:wangguoqin1001/Scorpio
Use productid = 2 for all products
Update amount in the header
No needinvoice selector
openpopup() modified for changing password
Change password
同步dr修改
basepkg字节对齐
同步工程文件
更新编译设置
更新编译设置
更新编译设置
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/support/dr2
Merge branch 't/3rdTools/yajl' into refs/top-bases/t/support/dr2
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/3rdTools/gmock
Merge branch 't/3rdTools/yaml' into refs/top-bases/t/support/dr2
Merge commit 'refs/top-bases/t/3rdTools/gmock' into t/3rdTools/gmock
Merge branch 't/3rdTools/gmock' into refs/top-bases/t/support/dr2
merge
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/support/game
Merge branch 't/3rdTools/yajl' into refs/top-bases/t/support/game
Merge branch 't/3rdTools/yaml' into refs/top-bases/t/support/game
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
gd.dr_store support validate
update dev-env-linux32.mk
Merge branch 'master' into refs/top-bases/t/3rdTools/gtest
Merge commit 'refs/top-bases/t/3rdTools/gtest' into t/3rdTools/gtest
Merge branch 'master' into refs/top-bases/t/3rdTools/gmock
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/3rdTools/gmock
Merge commit 'refs/top-bases/t/3rdTools/gmock' into t/3rdTools/gmock
buidtools support ragel
Merge commit 'refs/top-bases/t/3rdTools/argtable2' into t/3rdTools/argtable2
product-def-install.mk对于copy的目标没有生成目标目录的bug修复
Merge branch 'master' into refs/top-bases/t/3rdTools/gtest
Merge commit 'refs/top-bases/t/3rdTools/gtest' into t/3rdTools/gtest
Merge branch 'master' into refs/top-bases/t/3rdTools/gmock
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/3rdTools/gmock
Merge commit 'refs/top-bases/t/3rdTools/gmock' into t/3rdTools/gmock
Added gravityScale methods to Shape.
Initial cut of a better shape filter/query API.
Let build space parser cope with output from cbstool from NW 7.0 and NW
7.1 and later.
Sub-modules now get their own guid
Add launcher and basic installer.
Se empieza el CU de grupo modificado. Version inestable
Pour que ca compile
cleaned out some commented code
Describes the pain in README file
Somehow cross referencing between packages in the same stack got removed
Merge branch 'master' of github.com:willowgarage/buildfarm
added test for OnOffButton
Added margin in the menu
Changed in menuview
Minor tweaks
Started to implement the pause view. Not yet finnished
Added a creature Crab that is still unfinsihed
updated GameController
created classes
Merge branch 'master' of https://github.com/wollowizard/id2212-hw1.git
changed agency pages subsequent to deleting extra ID field
GetDeployment is working
added ratatosk logo and basic styles
iOS: bump version to 1.4

includes iOS 5.1 Console.WriteLine fix/recompile
hopefully fixed the finalize setup bug for real
added various new header pictures
added bootstrap-admin theme
added the rich-text-editor redactor.js to the admin-interface
added redactor.js to admin-interface
added admin-bootstrap theme
revised templates, fixed bugs
fixed bugs, added new models and tweaked settings
’->'
scoreBoard upper case
version 2.23.0
- 2.11.5
- SambaConfig.pm: fixed handling with comments in Read() and Write()
- SambaNmbLookup.pm: fixed checking nmb status
- SambaWinbind.pm: fixed AdjustNsswitch() and AdjustPam()
- updated testsuites


svn path=/branches/SuSE-Linux-9_3-Branch/samba-client/; revision=22256
modified README.md
modified REAMDE.md
Bugfix to getLastEdited API method, issue #845
Merge pull request #846 from jhollinger/master

Fix getLastEdited API method
Merge pull request #864 from Pita/develop

Merge bugfixes
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
fix issue #955: upd resolve library to 0.2.3
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
Merge pull request #961 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues-rebased-onto-master

Fix ie8 native xmlhttp support disabled issues rebased onto master
Update README.md

npm cache clean jshint was the only way to get jshint installed correctly again..
Update README.md: node download links and versions 

node downloads corrected links and preferred versions
Merge pull request #969 from rasos/patch-1

Update README.md
error handling and close is removed in express 3
attempt to put correct init in right place but could be wrong
Resolve merge conflicts

Conflicts:
	README.md
Remember, the `class` symbol is reserved in some environments.

Fixes issue introduced in 9be69ef2582dfc2c1b050041d4586cbd90d20e2c.
Merge pull request #1005 from cweider/fix-ie

Remember, the `class` symbol is reserved in some environments.
Still support API endpoints of v1 in v1.1
Add listAllGroups API endpoint

Adds a database key that lists all groups
Merge pull request #1008 from marcelklehr/fix/api-v1.1

Still support API endpoints of v1 in v1.1
List 12 plugins instead of 4

4 was a bit stingy :)  12 is a bit more friendly from a UX persepctive.
Fixed foreach loop on session IDs, was breaking EP on single session in cookie.
add pagination for bookings list (both in room-specific-booking  and my-all-booking)
moved apps from kobuki repo, closes #102
added tests home and projects
No more image border.
Major stuff

Added additional activities, working buttons, refined styles
Site updated at 2012-04-22 12:31:15 UTC
Site updated at 2012-04-24 10:46:19 UTC
finished problem for solution!
changed to tom theme
who is making all of these horrible typos
renamed "system" to "packages"
standard decoration
Merge Test 1 Windows to Mac.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
my excerise
Reversed bulletin order; removed past events
Tests: write xml reports.
Change target relase to 1.6
Added annotated PDF version of slide deck & notes on building/running the examples
Template changes
Merge branch 'master' of https://github.com/AITI-Philippines/S-Plan

Conflicts:
	env/www/studentplanner/studentplanner/templates/login.html
multi not ulti
Set system partition manually
Intial commit (5)

Removed IDE project file
debugged delete ops, needs more testing
changed name of global variables
Displays proper totals. Still needs to show the discount somewhere..
Merge branch 'random'
Add Constraint on entity Arrival
Ad CRUD for Arrival
Intermediate commit
syncronization modification
unsused class
Add interface for spawning FallingBlocks and correctly spawn a FallingBlock with the spawn(Location, FallingBlock.class) method. Adds BUKKIT-2282

Also add FallingBlock and methods.

Deprecated FallingSand to emphasize FallingBlock.
Let TripwireHook be attachable. Addresses BUKKIT-2278

This commit also makes TripwireHook consistent with other attachables
for the facing property.
Fully restrict the org.bukkit and net.minecraft namespace
Add isChunkInUse() to World. Addresses BUKKIT-2330
Updated version to 1.3.1-R2.0 in pom.xml for RB.
Updated version to 1.3.1-R2.1-SNAPSHOT for development towards next release.
Add API to retrieve a players EnderChest. Adds BUKKIT-2016
Add API for Sound, and playing the sounds for Worlds and Players. Adds BUKKIT-1430, BUKKIT-1226 and BUKKIT-2019
Bukkit++ Changes
Otros dos saltos de linea en pelota
Added Reload Extension support

Added support/option to reload extensions (not apps) instead od
enable/disable functionality.

- Version inc. 0.1.5 > 0.1.5.1
- Adopted to manifest version 2
- Renamed popup to default_popup in manifest.json
- Removed templates from index.html and inline script
(Script is moved to IndexScript.js and templates are recreated using
jQuery DOM calls)
- Removed inline script from options.html
(Script is moved to OptionsScript.js)
- Added reload functionality to engine.js
- Added reloadInsteadOfToggle variable to options.js and options.html
- Added reload.png
+++ Fixed bug in type arguments
Stage 2 - New Layout in Small Size devices
Remove ads view when press the delete button in category view.
Minor updats
Expand the network timeout value.  And network indicator
and more retweaking
initial RSS reading support
Spacing fix / SIL support
Prepend supplementary columns's classes with 'column-'
Lttle adjustment
User controller when user sees repos where he participates.
Model task belongs_to repo.
Repos page now includes repos other's users to participate to.
Migration for task model adds column repo_id.
Membership controller after processing of order redirects to index page of repos.
Repos controller differs users accordingly to its rights.
Tasks controller differs users accordingly to its rights.
Added attribute 'repo_id' to task model.
Deleted redundant link in navigation bar.
Show page for repo differs users accordingly to thier rights.
Added hidden field to task's form.
Partial 'import_to_yaml'.
Tasks' index page divided onto partials.
Task's show page differs users accordingly to thier rights.
Tasks_table partial.
Excluded redundant routes index and new.
Deleted redundant link from 'tasks_table' partial.
New 'sample_data.rake' file.
Mdifications générales
Ajout de l'énergie
Modifications - vaine - des périodes d'affichage.
added routes
Finish layout and routes
Some fixes for npm
add consult to the ds
reset() fails because it appears to be accessing 2 variables in the AddonManager but they dont exist, assume they were removed/renamed. I have added 2 properties to return the variables I think its after as well as a test for reset
added an s to the variable
Merge pull request #11 from AutomatedTester/bug_751348

Bug 751348 - reset() fails because it appears to be accessing 2 variables r=jhammel
Bug 751348 - Bump version of mozprofile to 0.3
Minor variable name fix from bug 751348
bumping version number to 0.3.1 for mozprofile
Added counter. Fixed game state.
.gitignore :: ignore config-archlinux

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
add buildstuff for archlinux repositories

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
add autoupdate scripts for community-packages

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
Basic port to webapp2.
Reverse ordering of output in both chart and table.
handle missing UCotDs not with a 404
make dailycp database-based
reference _.js if DEBUG is false
rm old unused styles
change button wording
rm unused style
style jquery.ui-state items consistently
Updated gems. UserShelves bug fixed
Finished sighting & note creating and updating; Fixed some issues with routing;
Removing the decimal portion of the date string for Travis CI
trying to get a date string that Travis CI's MySQL server likes
fixing date format in test-timezone-default.js
Merge branch 'master' into tz-param
Represents the grid as a whole.

setGoal calculation doesn't work yet.
Revert "Represents the grid as a whole."

This reverts commit 14aa7f810771ccf24d9192f6f6806ede8810167b.
First iteration of Gridz project.
Setting up setGoal method for a different approach
Updated Grid.java, setGoal() method

Method not complete but groundwork now done.  Changes include creating a boolean flag array to hold OutOfBound check errors.
Updated Grid.java /w working setGoal();

setGoal hasn't been tested enough yet, testing to follow.
Removed regexp matching in pgsql code and some unhelpful warnings
Из форума: Menu.Show(Items,"",0x8+0x80,Idx) не происходит позиционирование на пункт с номером Idx.


git-svn-id: http://farmanager.com/svn/trunk@9014 72235d2c-c60c-0410-a47a-a0032694dc5d
Changed some rogue spaces to tabs
Made it easier to change global rendering params

* Also updated client's Listener, Sound documentation
Revert "fixed composer.json"

This reverts commit 1e7d69362f3e80d95b32f5e8b8ab03cbbe87a436.
fixed composer.json
Added Windows compilation instruction to the README
Keep Linux line endings in README
Add debugging option
Merge branch 'hotfix/1.0.2'
Initial load of public repository

Signed-off-by: Josef Finsel <carpdeus@gmail.com>
updated angular to 1.0.0, fixed breaking changes
Getting better....

??Now what??
Add router to preserve screen state
Merge remote-tracking branch 'upstream/master'
Add sprite models and data

Add sprite model to handle the various kinds of sprites, create array of sprite data based on images. Have the view self render them.
Merge pull request #16 from conzett/master

Game router and sprite data models
Webcasts from iTunes
window less shader specs
Replaced old code

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@116599 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1194-169

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@113847 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1196-138

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@117089 eb64e737-3616-4df0-8941-5ee2ae88103d
update xap build

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@115708 eb64e737-3616-4df0-8941-5ee2ae88103d
添加php-complete.el
added sleeper effectID sql file (aknors request)

Signed-off-by: CodeRed421
fixes LIBS-42
Config property tabCls belongs to panel, not tabpanel
http://jangaroo.myjetbrains.com/youtrack/issue/LIBS-42

Moved property tabpanel#tabCls to panel and adapted documentation.
woo
woo
Merge branch 'master' of github.com:DGaffney/140kit_sandbox
Renamed RecitingDriver into QDriver. Updated the Qdriver to standards of QOSDriver, i.e. to ask for loadNetwork and exploration and changed learning rate and boltzmann instead of e-greedy. BASDriver and CaclaDriver also ask for explore, but not for load. This remains to be implemented.
meh.
This looks better ...
All new: Display the fragmentation level in percent.
Added preview image
Removed unneeded flyout.js import
Flyout clean-ups
Rewrote everything settings related to more compact and less annoying
Don't reload everything when flyout is opened, just load settings
Fixed the copy plugin
0.6.1
site: added database
Vectors are now immutable and everything is working again.
CHANGED CLASS "Graph.cs" & ADDED ENUM "FONTS"

+ CHANGED CLASS "Graph.cs"
+ ADDED ENUM "FONTS"
reference to hashchange into a var now
Wrote a README file
builds without errors and draws labels and borders
Updated version to 1.3.2-R2.1-SNAPSHOT for development towards next release.
Made books less powerful, though you should still read them!
Updated version to 1.3.2-R3.0 in pom.xml for RB.
Update CraftBukkit to Minecraft 1.4(.2).
Don't pass vanilla plugin channels to plugins. Fixes BUKKIT-2638

Vanilla has its own handlers for plugin channel messages for things like
texture packs, books, and anvils. When vanilla handles one of these messages
we should not also pass it to plugins because they will be duplicating work
and potentially running in to situations our plugin system isn't setup to
handle. This is how 1.3.2 worked but was lost in the 1.4.2 update.
Fixed generator-settings not being set. Fixes BUKKIT-2652
Remove spawn-radius setting in bukkit.yml in favour of spawn-protection in
server.properties. Fixes BUKKIT-2657
These books are too powerful!
Fix incorrect method names missed during update. Fixes BUKKIT-2653

A couple method names were changed between 1.3.2 and 1.4.2 but were missed
in the update. One of these affects being able to enchant bows and the
other is used for updating player animations while firing.
Add new entities to World.spawn method. Fixes BUKKIT-2658
Fix missed rename for ore exp dropping. Fixes BUKKIT-2662
Use correct variable for squid Y motion. Fixes BUKKIT-2648
Merge tag '1.3.2-R3.0' into 1.3

Jenkins build #2403

Conflicts:
	pom.xml
Merge branch 'master' into 1.4

Conflicts:
	pom.xml
	src/main/java/net/minecraft/server/DedicatedServer.java
	src/main/java/net/minecraft/server/EntityEnderDragon.java
	src/main/java/net/minecraft/server/MinecraftServer.java
Merge branch 'master' of git://github.com/Bukkit/CraftBukkit into 1.4
First cb 1.4 with antixray from Escapecraft 1.3 included.
Merge branch 'tulon-1.4' into develop

Conflicts:
	pom.xml
setup test utils
Filtering correct!
meta and style tweaks
ticket:5_fix - Added createsyncdb implicitly
0071 update
Update README.md

suma del idioma castellano y algunas imagenes y formato
removed unwanted log delegates and fixed some deps in hornetq-ra
added final deps for logging
Merge pull request #123 from andytaylor/master

removed log delegates and some logging fixes
clean
Fix exception when initializing RemoteServerConfiguration classes
Always print an error when getting exception here.
Fix test: Use a positive retry period.
fix javadoc warnings
remove unused imports
Improve tearDown: make sure sessionFactory gets closed.
Fix spelling in logging methods name.
Merge pull request #241 from FranciscoBorges/small-fixes

Trivial / Simple changes that accumulated in my master branch
HORNETQ-772 Set live to isBackup=true, if another server uses its nodeID
clean up
HORNETQ-722 HORNETQ-720 Stop backup when failing over
HORNETQ-772 Send fail-back request, if denied log warning at the requesting server
HORNETQ-772 Stop live during fail-back in different thread
HORNETQ-720 HORNETQ-772 User must configure which connectors to try using during fail-back
rename method for clarity
clean up
HORNETQ-772 HORNETQ-720 Add config file support to `failback-connectors`
HORNETQ-772 HORNETQ-720 Move existing data away when starting replicating backup
Fix NPE on backupLocator.
Refactor fail-back tests
HORNETQ-772 HORNETQ-720 Read nodeID from lock file if available
Remove apostrophe usage from messages: it conflicts with Format and formal language is more suitable for logging.
clean up: delete loads of auto-generated comments.
HORNETQ-772 HORNETQ-720 Move ID storage to JournalStorageManager to support replication.
fix javadoc warnings
remove unused imports
修复了项目文件merge的问题，可以打开project了

亡羊补牢