labofsahil/github-event-dataset-2012 huggingface dataset:
updating GeoTools class to pull out revision info from new git setup
moving tag sanity checks to after teh loading of common functions
Now using csv.DictReader
student home page
index.jade fixed
Merge branch 'master' of github.com:mchapman/wobblies
Display web view with website after photo is taken
show events by categories
show events by categories
more styles !
bundle installed.
El automata anda y ya se puede crear una gramatica a partir de el
Office Immunization Shots integration
Fixed many issues regarding Particles
new build w/protobuf feature
Force Travis to fallback to Firefox 16
Modified structure in RDFStore to mirror logic in Graphitejs
Updated cli-install script
Merge branch 'master' of github.com:meltmedia/cadmium
methods to compute and visualize distribution of oligotypes across datasets
Added colors to my rspec
Added simplecov gem
Old stuff, don't know what this commit is
Added new smb conf's
	deleted:    samba/smb.conf
Merge branch 'master' of github.com:metaphysix/Bacula

Conflicts:
	samba/smb-3.6.6.conf

	new file:   bacula.tar
	modified:   samba/smb-3.6.6.conf
Added subconvert .desktop file
Added 128x128 and 48x48 icons
Updated icons legal note
Updated install script to install and remove icons and .desktop
Removed group.
Fixed .sqlplain.ini again
풍선 이미지 적용
moved into its own directory
adding association between admin users and ong
fixing conflicts
Merge branch 'master' of github.com:miguelperez/speed
* added disjoint_treshold_sets and used it in kruskal2
Merge branch 'master' of https://github.com/mihaipopescu/VEGA
Login oder Logout - Menüeinträge werden je nach dem ein oder ausgeblendet
Grunt: Increase TestSwarm timeout to 30 minutes
Inline the boxModel test, and correct unit test. Closes gh-781.
Update to QUnit 1.6.0
Fix #11777. Add EditorConfig support, closes gh-715.
Fix indentation in /speed and /test dirs, closes gh-780.
Fix #7157. Animation callbacks shouldn't see an element as :animated.

Unless of course, there are other animations to be done! Closes gh-775.
Fix #11649. Preserve oldIE submit flag when cloning, closes gh-772.
Followup #11649, clean up events in unit test.
Removed some default files
Added editing users and admin
regression test case for fastcombine
add fast combine feature in Java
Dodanie tabel db
added announces to Loader
Started testing/evaluating Virtual_Machine
Merge branch 'master' of github.com:mistofvongola/asm
Доработано 100% платежи через Киви. Добавлено логирование по Киви и Вебмани.
Merge branch 'master' of https://github.com/mitasych/naholste
Remove non-existant URL_PREFIX constant
Remove operational servers
Moving exit_code in prompt
configuring tig
same thing with unit
[bugfix] some convertTag fixes
built on 5c7f9c558c
Update contents/articles/facebook-bucket-of-designers/index.md
fully working CRUD on users
Added dependency on designators_ros.
Fixed calculation of upper boundary for iteration...

... when putting a smaller matrix into a costmap.
Transform the pose correctly. x and y should be in map.

The z value used for selection of the correct reachability map layer
needs to be in torso_lift_link.
Fixed or-combination of reachability maps for different arms.

When combining several maps, use empty matrices and combine them using
m+ after generation to avoid one generator overwriting previous results.
Refactored ds_zone_walk to try every transformation, gives waaay more results.
new file create
tied up test and reporting (0.0.23)

- tied up the test and report generation procedure
- added the store folder
- added the PDF icons
- added dnagifts.report.css
- added the reports helper class
- added the reports model
- implemented the notification-indicator tab
Adding cluster member tagging feature
removing mdo-x reference from MDO solution file
Reduce verbosity

Makes the online server log a bit more useful.
Reduce calling gettimeofday() / time()
Merge branch 'master' of git://github.com/mopemope/meinheld into reduce-time

Conflicts:
	meinheld/server/server.c
Merge pull request #14 from methane/reduce-time

Reduce calling gettimeofday() / time()
msg: subtlizer
Changed a print to say.
Vishal, Vishnu #0 Corrected couchdb-lucene version
BalajiN | #0 | Added clear buttons to date fields in filters on container dashboard pages
Vishal, Vishnu #497 Added ivr properties for depencency with Decision Tree Controller when using emulator.
V2, Vishnu, Dev | #0 | fixing bug in patient & provider emulator(not submitting new values on clicking submit button)
BalajiN, Dheeru | #275 | Fixing Emulator's DTMF sending issue w.r.t. fixed size - Added a field & button to send desired DTMF input
Shruthi, Banka | #42 | Propagating domain level validation errors in the exception.
Update the URL to WinChan.  Use cachify for the resources.

issue #1871
issue #1937
Merge pull request #1942 from mozilla/issue_1937_auth_with_primary

Update the URL to WinChan.  Use cachify for the resources.
prescriptions
db , services and ui
report pernding
First Chage
Update README.md
tadah

tadah
test

test
Merge pull request #1 from Mark-Quiel/master

tes
auth_cvm: added logging and better error handling
shebang fix for tls, this one is actually a script
delete 3 relay plugins
new relay plugin, with tests!

replaces functionality of previous 3 relay plugins
relay: added note to UPGRADING, dates to plugin author
improve relay UPGRADE note
relay: use IETF IP testing addresses
another test tweak, for switching from 192.168 to 192.0
snoozedeploy for kavlan global
Added quick map example
Fix for Newsletter Form inputs
Return expression.
Prefix calls and method signatures.
[from now] 2012/08/27 14:14:09

diff --git a/.xvimrc b/.xvimrc
index ba6993a..4af30ed 100644
--- a/.xvimrc
+++ b/.xvimrc
@@ -4,5 +4,6 @@ nmap L $
 vmap L $
 nmap n nzz
 nmap N Nzz
+nmap , magg=G'a
 imap kj <Esc>
 set ignorecase
simplify css styling
hehj
tja
Merge branch 'master' of github.com:mushuit/tda367-10
Changed buffer move commands to use arrow keys, because that's what I reached for
Add donation reward itemscript.
Merge pull request #1 from Lillecarl/master

pull
Fix issues with slice handles
jotai tweekkei
arrayList<tablerows> for faking multimap
renamed imported_at to executed_at

Conflicts:

	lib/enju_event/version.rb
Merge branch '0.0.x' of github.com:nabeta/enju_event into 0.0.x

Conflicts:
	lib/enju_event/version.rb
bumped version
Allow sorting by language (fixes #270)
Merge branch 'master' of github.com:nabu-catalog/nabu
reset event.cfg back to default
Got a waveform generator partially working - using "." to draw.  Need to
update.
Merge branch 'master' of https://github.com/nammer/jReportLab.git
git diff表示の実行タイミングを修正
java snipet　削除
vim設定修正
save old icon as "_org"
elFinder up to newly (nao-pon/elFinder - 2.x_n: 9c65b622c1)
edit .vimrc .gvimrc
should be singular [ci skip]
Updated TODO and README 
[ci skip]
Whole pile of changes, including initial seaport dynamic port allocation for applications, application schemes, standalone application launching
Upgraded parent to version 34.
Use input_encoding to set encoding with Nokogiri
change sample
re-index sample
Fix URL for launcron robot
fixed conflicts in Makefiles
add quantity change type column providers
series of minor UI tweaks
fix tablekit reload and also fix undo edit command
add acts, shows, more bootstrap, more scaffolds
update act, show, user, layouts
add audio and img searching to act form
tweak bootstrap to have larger select boxes, finish act joining, patch act/user form to work
[fix] products page and scroll !
[fix] process page & scroll !!
[fix] some change ...
Merge remote-tracking branch 'origin/master'
Added procedure and boolean functions
Added initial sketch of a script that formats data for circos
Added sliding window function
General cleanup and new command line arguments
Updated .gitignore so that large test datasets are not added to the repository
Added new arguments
Added header processor function
Added multi locus statistics and window processing function
Added multi locus functions to fstats.py
Added some test bulk-segregant data
Command prefix can be specified in the config
Gemfile so bundle install just works™
fix up webserver and wiki to start bootstrapped and auth all works
front end handler and serve non-extension pages just using elnode.
Updates to the user component

Did some minor formatting changes to a few files
Finished support for handling access strings over a strictly javascript interface.
Revision to the save() method in the Gd class of the Image component.
Make setkey_principal_3() apply ks policy right

Also make apply_keysalt_policy() outputs optional.
thread_n max_items available validated
fixed subgraph rule ordering
Update media
Link to new theme
Custom loader for website
Use relative paths for loading content
Move content to tabs
Move Flattr button to footer
fullname for registration page
Start on cellular generator

Neighbor Tiles is broken in Map.RB not sure why
minor comment fixes
added useful comments
Comment temporal work.
Adding .my.cnf, set a pager
Adding Makefile
add a comment deletion with ajax.

 - finished lesson #43
 - finished lesson #44
fixed self message
addd tip
Show username in title.
Merge pull request #49 from mattflaschen/username_title

Show username in title
reduce ttl
add log ui

fix resources filename issue
removed android-map dependecy
Edits to install.php
dont fatal on failed vbox config load to allow for brand new setups
Removed UpdateState function.
module News: fix preg_match date
Merge branch 'develop' of https://github.com/vuthao/nukeviet.git into develop
Merge branch 'develop' of https://github.com/vuthao/nukeviet.git into develop
fix function nv_ParseIP
change config install
Merge pull request #3 from vuthao/develop

Change file config install
adds better test coverage
moves nodes into their own file
moves operator/s into their own file
extracts Tokenizer class
updated .bash_profile, removed .bashrc
change css, font size resume
extabit (download): fix, upstream modified
bayfiles (download): set download interval to 5 min
download.sh: drop useless curly brackets around variable

Example:
echo "${FILENAME}.$COUNT"
Can be translated to:
echo "$FILENAME.$COUNT"
refactor to decouple world object sim and views
Only set floatingPoint and littleEndian flags in CAF demuxer when the reading lpcm format
[maven-release-plugin] prepare for next development iteration
binary search tree implemented
Merge commit 'ce167e9'
Fixes typo.
Adds required minimum size for matchmakers.
Removes unneeded imports.
[README][xs]: tweak.
[views/load.js][s]: get rid of tabbable setup and have all load options in one big page.
[refactor][s]: remove obsolete "header" (login) stuff.
[refactor][s]: move 1,2,3,4 overview from login.js view to index.html.
[#21,login][m]: functioning login using a separate window - fixes #21.

* No longer require login view (merged with index page or boot.js)
* Requires quite a bit of refactoring.
[refactor][s]: remove toggleView from application.js as obsolete (afaict).
[views/load][xs]: remove id on view as unnecessary and causing an issue as #load is in url.
Merge branch 'master' into gh-pages
Complete jar
transmission:
 * use "magic" (C|LD)FLAGS to reduce package size (dynamically linked binaries: -1.3MB, statically linked binaries: -3.8MB)


git-svn-id: file:///var/svn/freetz/trunk@9298 149334a1-2f27-0410-a3b9-fc62619ac1e6
gl2progs: added Phong shading model to the interaction shader.

The specularity exponent is fixed at 16.0f however this should be
calculated from a uniform using information derived from the surface
material; i.e. wood will have a different exponent than metal, see
renderer/Material.h.

Signed-off-by: Oliver McFadden <omcfadde@gmail.com>
gl2progs: saturate() == clamp(f, 0.0, 1.0)

Signed-off-by: Oliver McFadden <omcfadde@gmail.com>
gl2progs: #if defined(BLINN_PHONG)

Signed-off-by: Oliver McFadden <omcfadde@gmail.com>
gl2progs: Phong exponent of 4.0f. Backwards compatibility warning!

This value somewhat resembles the Blinn-Phong exponent of 16.0f,
however, these are different lighting models and therefore will never
match perfectly.

Until I'm able to find a useful look-up table of material type to
specularity, use a constant value for all surfaces in the world.

http://en.wikipedia.org/wiki/Blinn%E2%80%93Phong_shading_model#Description

Signed-off-by: Oliver McFadden <omcfadde@gmail.com>
mejoras laminas
[data] Add customize-link.html, css, js
[data] customize-link のデザイン調整
[lib][data] text, url をパネルに表示

Add-on -----------> ContentScript
        text, url
[lib][data] リンクテキストの生成処理

Add-on <----------- ContentScript
         text, url
[data] title属性に対応

inputのhidden属性を使う
[lib] 文言修正、カスタムリンクの作成
[lib][data] デザイン調整
[lib][data] 生成するリンク種類を表示するように
[test] テストを通す
Merge branch 'customize-link' into develop
[lib] Customize Link をコンテキストメニューの上部に移動
[lib] 文言の調整
[lib] 変更 : Redo時の通知タイトル (コンテキストメニュー経由)

'Redo (Ctrl+C)' -> 'PlainText'
[lib] メニュー順の再調整
[lib] お行儀のいいように

パネルを一枚で使い回す
enterキーのハンドリング<form>を使わずjQueryのイベントで
[lib] 文言を変更 'ショートカットキー'
[lib] ダイレクト選択以外のショートカットも無効にするように
[lib] 英語テキストも変更
Merge branch 'disable-shortcut' into develop
[lib] 文言調整
[all] Support Add-on SDK 1.9
[data] 修正 : setting.ja.html の文字化け
[lib][data] デフォルト設定にMarkdown等を追加

PlainText
HTML
Markdown
MediaWiki
PukiWiki
TiddlyWiki
Twitter
hatena
[data] ヘルプ画面の調整
[all] 1.3 準備
improvement for dictionary scrool screen  problem.
improvement for glow light control dialog.
add public/private hostnames to instance and elb
change template to use public_dns_name
svn merge branch to trunk

git-svn-id: https://scm.gforge.inria.fr/svn/openalea/trunk@3625 04ea39c6-a500-0410-8508-e77fe2a861cf
svn merge branch to trunk

git-svn-id: https://scm.gforge.inria.fr/svn/openalea/trunk@3626 04ea39c6-a500-0410-8508-e77fe2a861cf
svn merge branch to trunk

git-svn-id: https://scm.gforge.inria.fr/svn/openalea/trunk@3627 04ea39c6-a500-0410-8508-e77fe2a861cf
version 1.3 build 20121026T240
+ actual fix for migration
+ implement some of the DR macro codes
GEOS-5301 - handling exception back from FeatureSource.getInfo()
Merge branch 'master' of git://github.com/geoserver/geoserver
changing config file names and paths, fixes #108
changed configuration file name, paths and property keys; added plugin resource to REST interface; updated email notification plugin info; improved PluginManager log messages; added guard for null in ApplicationListener for when no context is available
updating deprecated method of connecting to database
creating Source management REST operations, making property value creation/update define a proper adaptor, testing code (not finished, unstable\!)
adding source resource management REST methods, creating source and adaptor REST unit tests, setting up a new knowledge base folder in every test on REST unit tests and KB unit tests
update the pic loading icon
Fix logic error in reporting

Change-Id: I0444353eb753387fd792605371ad25ffe0e8990e
Merge "fix ajax row update polling decay,"
dhcp.filters needs ovs_vsctl permission

The dhcp agent calls ovs_vsctl so it will fail if using rootwrap
and these aren't specified. The reason why this was working using
rootwrap before is because there are other filters in
etc/quantum/rootwrap.d that specifiy ovs_vsctl which
allows the agent to make those calls. Fixes bug 1090072

Change-Id: I509c191c97e7187361a09788e841ebb5a9f934c7
Merge "dhcp.filters needs ovs_vsctl permission" into stable/folsom
Update notes for submitted changes

* Fix linux bridge section name Bug #1006684
Bump next version to 2012.2.1

Open stable/folsom by bumping next version to 2012.2.1.

Change-Id: I1d6d3a4dadc21427b5aa23a1f093850fd667f741
Empty Body testing according to the RFC2616

* 204, 205, 304 response MUST NOT have a body
* 205 MUST NOT have entity-header
* responses to a HEAD method MUST NOT have a body
* responses with 1xx codes MUST NOT have a body

Change-Id: I24f60459141e6273c03f146352f583669e16ee23
Merge "Empty Body testing according to the RFC2616"
Update notes for submitted changes

* Move files in doc folder to follow cmake-modules-webos format
Name styleguide_path
Use powerline-bash.py as prompt
Update eesc_ext.profile
2.5.6
fix pmd importer for blender2.63
fix pmd exporter for blender 2.63
2.6.0
initial directory structure and cakefile
Adding JustNancy case study
Log rcode when checkForReportsBulk() fails
memory leak in spritecache fixed
Smoothed arcs, made geocraft.js for non-view-specific functions
Made d3_utils.js for general d3 utilities. Includes d3_utils.wideArc, which helps draw aesthetic wide arcs (using fill instead of stroke-width).
Added d3_utils.js with wideArc function, Vector2D.js
文言の修正．著作権表記を記載
added graph.go, implemented interface, some funcs
fix permisos para compras
Remove data-tag-name "feature" from <script> tags

This "feature" has been made available in #299. Now, 6 months later, to me this doesn't make much sense anymore since this gives the <script> tag too much power.

I also think that this possibility of defining the tag name within the script tag is not even known to many developers ...
Fix indentation of code samples in documentation; fix typos and grammar
Merge pull request #851 from joliss/doc

Fix indentation of code samples in documentation; fix typos and grammar
no normalize in whupdate
rewrite the cpp file. fixed warm start problem.
UI Updates
UI Update
Updated views to take proper attribute names
UI that fixes end_turn
UI that fixes tile highlighting
UI that fixes spawning
UI with mouse offset fix
Pushing latest UI
UI updates
Make a basic user model, with passwords. git doesn't allow exclaimation marks, dammit.  chp 6
Finish user signup, chp7
Add SSL in production
Finish sign in chp 8
Fixed errors with tests, yeesh
Initial spike that doesn't require js files correctly.
remove zprezto :)
slim down zshenv a bit
a minimal zshrc
update modules/Rakefile for sans zprezto
move svn alias into git config
more cruft out of zsh
git - add tg fix svn alias
Added wdpware2.txt
Merge branch 'master' of http://github.com/wdpware/learngit

Conflicts:
	wdpware.txt
fixed system call for closing connection

one should call closesocket() instead of close() in win32 platform
Merge pull request #10 from narkq/master

Invalid system call for closing connection socket in windows
add stubs for ide use
fix stubs
fix stubs some more
silence phpstorm
add new timeout constant
fix value of AMQP_IFUNUSED
add setTimeout and getTimeout to AMQPConnection
rename getExchange to getExchangeName
add ConsumerTag to consume
bugfix, if a user revoked github authorization and signed in again
quote-paper-mark
修正企劃上傳500
Merge remote-tracking branch 'perchouli/dev' into perchouli_master
Merge pull request #31 from copyliu/perchouli_master

Perchouli master
Add options (including request URL) to support using the URL from the test context name.
css grid - update readme
Structured it slightly differently.
distro-3.7: enable PAE for Arch i686
Merge branch 'distro-3.7' into pf-3.7
Añadido README y quitado moduloadmin
文件管理辅助工具

1、修改文件过虑功能，支持多字符串过滤
2、增加重命名功能
3、增加批量重命名功能
Fully working version of source repositories.
made servlet-api provided so it wasn't bundled into the deploy
Changed format string at strftime to portable version (was runtime error at MSVC)
dev tst
Merge branch 'master' of https://github.com/picaro/cook-droid.git
push the right code
adding files to chw
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
remove .DS_Store and remove unnecessary files
Merge remote-tracking branch 'upstream/master'
modify to account for local storage of data from forms
change name from demoVersion2 to motechScheduleTracking
changing paths to reflect new location
Merge remote-tracking branch 'upstream/master'
deleted commented code
enum for pages, change to ===, remove whitespace, change logic (isNaN), change variable names (temp, store)
model-side validation working for patient_options forms
Merge remote-tracking branch 'upstream/master'
adding radio buttons
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
OPD UI Updated Except Examination Tab
RAXAJSS-222 Pharmacy - Create Add Patient button in pharmacy, send new person + patient to OpenMRS
OPD UI updated except examination tab : Afetr Modifications as Suggested
RAXAJSS-229 & RAXAJSS-241
fixed windows include for mac, verified drawing on osx too
string re-writing working
Adds ctrl-fix utility.
inventory management singleton enabled.
changed unicorn var in window namespace to "game"
few final inventory changes, removed some console.logs
resolved merge conflict
Merge pull request #7 from pkarl/pete_disorganized

Pete disorganized
31.10.2012
bash tweaks
Merge branch 'master' of github.com:plathrop/dotfiles
- disabled goffice plugin, abiword does not build with latest libgoffice
new games
iterated through reverse search to get lexicopositive bases
added initial specifics logic
fixed negations in specific occurrences
merged with mh
added reduce to array
Make pg_tablespace_location(0) return the database's default tablespace.

This definition is convenient when applying the function to the
reltablespace column of pg_class, since that's what zero means there;
and it doesn't interfere with any other plausible use of the function.
Per gripe from Bruce Momjian.
Removing dependence on LAPACK's Cholesky
Merge remote branch 'upstream/master' into integration
Merge branch 'integration'
Fix typo
DB/SAI: added Gruuls' Lair Raid scripts
DB/SAI: added Maghteridon's Lair Raid scripts
DB/SAI: added Lost City of the Tol'vir Dungeon Normal/Heroic mode scripts
Merge branch 'master' of https://github.com/Arkania/ArkCORE
DB/vehicle_accessory Fix error on SQLDriver.log & DBErrors.log

ERROR: [1054] Unknown column 'entry' in 'field list'
Loaded 0 LoadVehicleAccessor. DB table `vehicle_accessory` is empty.

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
DB/linked_respawn Fix error consol: Couldn't get creaturedata for GUIDLow …

…data for GUIDLow

Remove invalid entry

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
DB/gameobject Fix error consol

Table `gameobject` have gameobject (GUID: 4024279 Entry: 207209) with invalid `state` (24) value, skip

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
Core/CreatureText: missing changes
Update src/server/game/Entities/Player/Player.cpp

Fix Player::UpdateSpellCooldown
Merge branch 'master' of https://github.com/Arkania/ArkCORE
Merge pull request #119 from chglove/master

Player::UpdateSpellCooldown has wrong calculation when amount < 0
merge
agoraoununca
Added comment and INTERNAL_IPS.
Deleted TODO comment.
Fixed comment.
Update jQuery to new version
Merge pull request #233 from Domen91/jquery_update

Update jQuery to new version
Add design for foursquare login button
Updated requirements.
Merge pull request #229 from Domen91/pushserver-fixes

Added comment and INTERNAL_IPS.
Merge pull request #235 from Domen91/buttoncss

Add design for foursquare login button
Merge remote-tracking branch 'upstream/master' into Issue-#196
ReStructuredText formatting
updated about page
updated favicon
added environment variables for specifying the max lifetime of posts
switched html format to fetch content after page load. fixes #13
fixed about page indentation
fixed origin of lobster font WOFF #56
Initiate the Pdf view, only the framework show.
Overwriting check while loading a notebook implemented
Added package tasks to main makefile.
updated README with migration information
estilos de impresion
changed config file
minifcation config read from mapping.json
* updated to jgroups 3.2.0.Alpha1
Added Range#toString()
Added a test for valueOf
Add comment in pubnub.m.
Make spec_helper manage tmpdir.

This adds management of the ENV[TMPDIR] when running rspec tests using
spec_helper. Before tests are being run, a temporary directory is
created under the current tmpdir. This temporary directory is then set
as the ENV[TMPDIR].

After all tests have been run, this temporary directory is removed.
The directory is created with the prefix "rspecrun" to easily identify
it in case the spec testing crashes before having cleaned up.

Conflicts:

	spec/spec_helper.rb
Merge remote-tracking branch 'upstream/2.7.x' into 3.0.x

* upstream/2.7.x:
  Make spec_helper manage tmpdir.

Conflicts:
	spec/spec_helper.rb
Merge remote-tracking branch 'upstream/3.0.x'

* upstream/3.0.x:
  Make spec_helper manage tmpdir.
Use rspec 2.11 compatible block syntax

In rspec 2.11, expectations on a block must take the form of expect...to or
lambda...should. Other combinations of those are no longer accepted. This
commit converts all mixed cases to use expect...to, as it seems to be the
preferred syntax now.
Add additional commits to CHANGELOG missed in 2.7.19rc1
Fix build targets for 2.7.x

This commit revises the lists of cows and mocks to build against to remove
redundant and unnecessary targets given Puppet is noarch.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
rm packaging artifacts in rpm spec, debian rules

The 2.7.x packaging will include misc packaging artifacts we shouldn't
ship. This commit removes them in packaging.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Merge pull request #1255 from MosesMendoza/maint/2.7.x/packaging_fixes

Maint/2.7.x/packaging fixes
(#13367) Patch SemVer to permit ranges including pre-release components.
update + fix bug with showing file in combobox when even after he was closed

Signed-off-by: Alex <pussbb@gmail.com>
Moving to API-based model
Add some basic caching.
Merge branch 'api-based'

Conflicts:
	init.rb
Merge pull request #5 from deafbybeheading/api-based

Moving to API-based model
for some reason vim-clojure is not setting the file type correctly
fixed magnetometer driver (needed conversion from big to little endian)
Updated MAVLink search path to recent MAVLink revision
made gps auto mode more modular, added more mavlink output
Remove pymsi from the epicsapps distribution (renamed dbpreproc, hosted at https://github.com/anunuclear/dbpreproc)
[Homepage][v2.2] Modification de Platonique en Celibataire
Change naming convention of snapshots to db.coll
Write README
added external spatial index
Ignore fixtures directory.
Add interface listing

* Melange can now list/page through all interfaces
* filter by device_id, tenant_id, or network_id
Merge pull request #14 from jkoelker/list_interfaces

Add interface listing
Add plugin 'vim-smartinput'
Fix issue/25

Use a second open actions. One with a menu and one without a menu.
Merge pull request #29 from giselher/master

Fix issue/25 (Open menu action)
add methods to get NumActive and NumIdle of the pool
First Commit
first working version
last before we start splitting the actions
working
small changes 0.2.0
Merge branch 'master' of https://github.com/ralfbs/flatmgrpay
Rename "List of Algorithms" to "Lijst van algoritmen"
Jeyakar - Manage photos UI
Jeyakar - Advanced Search and Highlight Field UI change
Jeyakar - Modified styling in advanced search
Jeyakar - UI styling
Merge branch 'master' of github.com:jeyakar/RapidFTR

Conflicts:
	app/views/advanced_search/index.html.erb
Jeyakar - UI for Contact information page
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of https://github.com/jeyakar/RapidFTR into pull_req_305
Fix - Ashok - Downgraded sunspot_solr to 1.3.1 as 1.3.3 having some issues with stopping and starting solr
remove old testing docs, since it's been replaced
remove stale link to old testing docs
replaceWith() -> replace()
configure: fix typo
Move configuration to libs (incomplete)

Signed-off-by: Rob Caelers <robc@krandor.org>
Move configuration to libs

Signed-off-by: Rob Caelers <robc@krandor.org>
Use smart pointers in configuration lib.

Signed-off-by: Rob Caelers <robc@krandor.org>
Move timesource to utils lib

Signed-off-by: Rob Caelers <robc@krandor.org>
Fix compilation warning.

Signed-off-by: Rob Caelers <robc@krandor.org>
Networking rewrite, part IV
Fix compilation warning.

Signed-off-by: Rob Caelers <robc@krandor.org>
Installs jquery.
Installs stylus.
Broke parts into seperate classes, started to add tests.
save and read custom link/joint parameters through collada, bumped spec to 0.3.2
Agrega imagen de la roomba
add couch_httpd_config.

manage the config updates in one place.
hbase updates

- changed handler and handler delegate
- added test batch job for hbase
Merge pull request #5 from shashiks/master

Test code for HBase added
+ betweenness centrality
simpler button implementation
a little button bug correction
Merge pull request #21 from renoust/ben_repository

Ben repository
temporarily disabled the existing repo check for debugging purposes
netty pipeline ordering
ParamConverter
Merge pull request #169 from patriot1burke/master

param converters
Commented out speed limit work-in-progress
Added 'inflateTextureBlockBuffer', to enable decompression of individual mipmap levels.
Also fixed a couple of overflow bugs.
Agregando a medidas el formato y la internacionalización, se espera por
la versión final de la vista.
Added editor configuration dialog
Fixed typo on user add dialog
Added editor settings to right-bar
Misc cleanup
Fixed overflow scroll
Misc JS Fix
whitespace cleanup
Fix Issue#41 resulting from a reference to active session being returned even after closing all the editor instances
Fix the issue of editor bottom bar disappearing after closing all instances
Fix the issue of Editor bottom bar retaining the path of last opened file
Cleanup mixed indentation
Fix the issue of editor bottom bar retaining the path of previous active session after closing a session
Fix for theme backgrounds (dark on light themes)
Merge branch 'master' of https://github.com/Fluidbyte/Codiad
Reset editor themes
Fix themes with background issues
Fixing install error ( no config.php )
Removed duplicate 'New Folder'
Removed duplicate 'New Folder' entry on menu
Merge branch 'master' of https://github.com/Fluidbyte/Codiad
add fjennet's changes to adapt to Processing 2.0
start work on adding the new library.properties
finish porting to Processing2
move the examples and tutorials
update the examples
update the makefile
add temp files ignore
fix the Makefile
update to Processing 2.0
remove the dependency on AWT now it should work with Android
bump up version
update web
Merge branch 'master' into port-processing2
ga-api corrected and ga-eng added more text
ga-eng: section axioms added
ga-eng: edited
ge-eng: corrections and proof reading
ga-eng: duals replaced by reciprocals
Add change to README
added versioned url
docs added and wrong  filename fix
remove needless tiles and templates
replaced some tabs in the makefile with spaces (looks better in gh)
Removed deprecated uses of g_strcasecmp and g_strncasecmp

fixes #93
Cleanup format string warnings, use g_ string funcs
Merge remote-tracking branch 'shadoworg/master'

Conflicts:
	src/library/scallion/scallion-registration.c
	src/library/scallion/tor_externs.h
Moved shadow plugins to plugins folder, other files to engine
Fix clang warnings
cleanup cmake files

refs #58
Added SIGNED_* settings for prod
adicionando avaliação de exemplo
Revert "Stable fix for hunters pets"

This reverts commit 5b1552bccdd0ebce443fce645d200f74709ee336.

Conflicts:

	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
Some reverting for testing.
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Core/Pets: Fix move command
<fix error: unknown PET flag Action 7 and spellid 4>
DB: Added missing SQL for commit a2492af0d20ce6c59f7757e69b3ed47f3472cedf
Venugh if you do tc merges make sure there
1 even needed in the first place,
2 have the corresponding sqls, with out this sql this will bjork peoples locales.

Signed-off-by: Bootz <bootz@projectskyfire.org>
DB: Proper SQL Renaming. to keep Sql Standards alive in this dir.

Signed-off-by: Bootz <bootz@projectskyfire.org>
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
[Core] Fix compile on linux
Merge pull request #360 from Emtec/master

Fix compile on OS LiNUX
Core7Misc: Fix crlf in files.
Core/Misc: Code style.
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Core: Fix build.
Core7DBLayer: Apply coding style.
Memory: Get rid of some memory leaks, converted FormationMgr back to singleton
thx Subv
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Core/DBLayer: Convert PAppend() queries to prepared statements
thx leak
NOTE:
Most of the cores queries have been converted to prepared statements now. If your code contains queries, please either use the exiting or implement new statements.
The only exclusions are one-time queries (e.g. for core startup) and queries that can't be prepared due to limitations.
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU
Merge with UI branch in a manual way
basic visual interface created
Merge branch 'master' into UI

Conflicts:
	web/IPTVWebsite/assets/js/iptv_host_processor.js
integrated partially - UNTESTED
Merge branch 'lab_LH_branch'

Conflicts:
	web/IPTVWebsite/IPTVWebsite.csproj
	web/IPTVWebsite/host.html
	web/IPTVWebsite/remote.html
Added file with the remote demo markup in
Merge branch 'master' into lab_LH_branch
updated merge
Update terminology.tex

Implementing furigana - part 1.
Another user added a call
Another user merged chnages in main.cpp
branch1 modify test.txt first
Merge branch 'master' of https://github.com/roger120607/hiGit
Add tests for new #validates_armotized_presence_of
First basic implementation of the validator
Validator accepts a single locale too
Validator should fail if the attr does not exist
Add explanation to the readme
Merge pull request #7 from rogercampos/add-armotized-validations

Add armotized validations
little fixes
updated mac address
Merge branch 'dev'
debugging and testing changes
changed temporary logo
git help -w uses git-scm.com docs
vim stuff
ack and git-sh updates
git-conflicts - show files in conflict state after merge
Env classes and constants. Boostrapper revamp.
Spells -> Base de datos

Spells agregados a la base de datos ~
Don't repeatedly call CompiledMethod#lines
Correctly print defined line specially
Fixed vimfiles folder
jjjkk
Now prints out timestamp

Also made the All Done log message clearer
Marimoクラスの実装方法の変更/マリモのちらつくのを抑えた

MarimoクラスをINotifyPropertyChangedの実装ではなくCommon/BindableBaseの継承に変更
Marioクラスの実装の仕方をHelloworldModelと同じになるように修正
Finished game flow implementation
Fixed errors
Game implementation in separate file
fixed thumb func. Changed to cheaper image resize interpolation
progit add bookmark
broke color defs out to a separate file
updated for changes at work
removed mac nfs aliases
optionally install to another user's home
resolved conflicts
add border width to lines
version bump
Vundling my .vimrc, created .jshintrc #gk
Pages controller merge niet. Nu samengevoegd
Merge branch 'master' of github.com:sagieske/Project1
SG3-UTILS: update the sg3 utils patch
Fixed bug#63627 & #63626 and add all the mysqlnd-weirdname ini options too


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328600 c90b9560-bf6c-de11-be94-00142212c4b1
This extension isn't documented or maintained, bye bye


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328601 c90b9560-bf6c-de11-be94-00142212c4b1
Fixed bug#63621 and #63622 (missing ini settings)


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328602 c90b9560-bf6c-de11-be94-00142212c4b1
Kill docs on allow_webdav_methods which hasn't existed for a decade. Fixes bug #63609


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328603 c90b9560-bf6c-de11-be94-00142212c4b1
Fixed bug#63603 changelog for allow_url_include unclear



git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328605 c90b9560-bf6c-de11-be94-00142212c4b1
Capistrano multistage support
Updating Aluminum.jar...
update gemfile for sqllite
test
Modified premake for ArchLinux

"-mt" for few boost libraries removed
deleted hello.txt as it was used for a test
enforce "Connection: close" under twisted (tornado already does this), and don't call request.finish on disconnected connections
Introduce release build tracing into the profiler
Alternate cuckoo registration
添加舞台公用类；完善游戏定时器
include icinga::params
reg_grep2.pl add ignorecase
quiz1.pl \ needs escape
quiz1.pl escape for *
Remove debug log messages from ScalatraTests

Removed debug log messages from ScalatraTests. These debug messages
do not add much value to the user and, if the user has debug level
enabled, will result in quite messy test output. In some cases,
such as when handling binary data, these messages even cause
iTerm 2 to crash.
Merge pull request #190 from mnylen/remove-log-debug-in-scalatratests

Remove debug log messages from ScalatraTests
* 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
Use local scoping for variables and check for #tools being on the page.
Lining things up.
Fixed toolbar scrolling, kind of.
Updating discussions and base with new permissions and new setups
One word: insets.
Added New Files from Computer to Repository
association prefetching for n:m associations
has function
added hasSingle and hasAll functions to DAO
added hasSingle and hasAll functions to DAO
Merge pull request #200 from innofluence/hasAssociation

Checking whether an object is already associated
center home page info
Merge branch 'dev'
reset last known location on restart of bounded location listener
Merge remote branch 'origin/master'
reset last known location when stopping bounded location listener
More pathogen commands
Updated gitignore to ignore swap files.
add setip function to debugger
Merge branch 'set-instruction-pointer' into develop
close thread handle before failing
log the getlasterror result, when a failure occurs
fix breakpoint set/unset mechanisms
Merge branch 'debugger-fixes' into develop
make intptrtoformattedaddress a public function
Merge branch 'publicize-address-formatter' into develop
fix initial scan in scanner
Merge branch 'fix-initial-scan' into develop
add progress notifier to scanner
Merge branch 'scanner-progress' into develop
update distorm3cs
Merge branch 'update-distorm3cs' into develop
fix compile error for 64-bit builds
Merge branch 'fix-compile-error' into develop
make winapi features public
make the proc property publicly available
Merge branch 'refractor' into develop
update distorm3cs
Added ackbar and lolz
Added package needed for lolz script
Added additional packages for lolz script
Added the bees script
Merge branch 'master' of github.com:seedcoworking/ken
Add :get_extjs task for easy retrieval of Ext JS.
Add :config_file and :configure tasks.

The :config_file task generates initial simple sdk-vars.rb config.

The :configure runs both :get_extjs and :config_file, doing the
initial setup for running jsduck.
Changing travis.yml version
fixed a way to handle negative to 0 quantity fix
removed some debugging, unnecc listening on connect event
Fix small bug with server list
Add list and end commands to ftp.
Merge pull request #1 from blackberry/master

Rebase from v1.4.0
Merge pull request #284 from sgrenier/next

Updated heightmap support
Fixes #286. Missing slash in computed relative path for any new project that is not under GamePlay. Tested fixed for a new project not under GamePlay, specified both relative and absolute. Tested no regression for a new project that is under GamePlay.
Merge pull request #287 from kwhatmough/master

Fixes #286 missing slash for new projects that are not under GamePlay.
Updated gameplay-encoder and README for building on MacOSX with latest FBX 2013.2
Merge pull request #288 from blackberry/master

Rebase from master for patches.
Removes annoying double slashes in project files. (The newproject script has since been fixed, going forward).
Merge pull request #290 from kwhatmough/master

Removes annoying double slashes in project files
Merge pull request #291 from blackberry/master

Rebase from master
Fixed new project template for Visual Studio.
Fixes duplicate line in TemplateGame.cpp
Fixes colored.frag shader.
Adds game.config on desktop systems which support it.
Merge branch 'master' of https://github.com/blackberry/GamePlay
Updated new project wizard for xcode
Merge pull request #292 from seanpaultaylor/master

Fixes new project scripts
Merge pull request #293 from blackberry/master

Rebase from master for patches.
Removed declaration of u_ambientColor in new project box.material
Fixes new project to use title in game.config in windows.
Merge pull request #294 from seanpaultaylor/master

Additional fixes for new project scripts
Merge pull request #295 from blackberry/master

Rebase from master
Added support for multiple UV sets in encoder for both Collada and FBX.
Fixed lightmapping support in colored and textured unlit shaders.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
issue #18433: explanatory comments
EvolveBiz
modelos mEliminaFichas, meliminaIntervenciones, mEliminaPerpetrador listos
modelos de actores_m y casos_m actualizadps ára recibir parametros
Correción de comentarios en los modelos
modelo mTraerDAtosCatalogoTipoIntervencion corregido en el campo tipoIntervencionN*Id
Correccion en relacion actores
Initial commit -  personal emacs config files.
Merge branch 'master' of github.com:shawnpage/emacs.d
Added hetzner::password_resetter dev deps
Working toward theme management
add landing page pic; smaller font for subscriptions setting
add missing classify.clj
small change to pie because we already inherited didInsertElement
first commit
Add btree free
Fixed up some memory issue
Fuck GFW
Console display working well
Update vim scrollback macro so that the number of filler lines at the end of the window are minimised
added a Go to command mapping for scrollback mode
nicer fold text for foregrounded processes, as well as handling those started with %
give scrollback view clearer line numbers
tweaks to splice - diplay leader in hud and make commands silent
change taglist to leader l
Set files that start with a shebang to executable - also set autoread so that we aren't warned about it
Use leader-tab for tab navigation
add mappings for ack
make sudo to write more robust (and change it to a command since it is not used often)
get rid of unused settings
don't let h and l go to a different line
write sendto function for sending text to local screen windows
screen key bindings for split
UPDATED WITH LATEST GUI
Suppression de caracteres blancs inutiles.
Mise a jour du theme.
Traduction de gnome-login et gnome-register.
Update from h1354109.stratoserver.net (Mo 4. Jun 17:29:45 CEST 2012)
Update from h1354109.stratoserver.net (Mo 4. Jun 17:40:38 CEST 2012)
Allows different username than repro
handles error if not authenticated
removed some useless git files
bisogna fare entrare la canzone, l'array invece di int può essere più piccolo se ci metto gli indirizzi delle note!!!
	modified:   main.c
added GPL
	modified:   main.c
funzionaaaaaaaaaaaaaaaaaaaaaaaaaaaa grande mancausoft XD
note non ne entrano più, uffa :(
	modified:   main.c
adesso l'array va su rom, e ci entra, grazie al consiglio del prof Santoro :D
	modified:   main.c
canzone compleatata :P
	modified:   main.c
bisogna cambiare... come va avanti o indietro il motore :S https://dl.dropbox.com/u/10051379/VIDEO0216.3gp
	modified:   main.c
la scoperta dei sedicesimi
	modified:   main.c
ultima versione, quella del video http://www.youtube.com/watch?v=ZUlTxEf_b1Q
	modified:   main.c
piccola correzione licenza :P
risoluzione conflitti
Add newer version of TeXLive to PATHs
Single space when joining lines in Vim
Switched site search back to Google because Duck Duck Go still hasn't managed to properly index the site and/or actually find any useful results whatsoever. This makes me sad.
add: use OBJ-file material name as material type
reuse object
changed quaddrawer, fixed vbomesh to use unsigned ints if necessary for
indices
Reset process.title in process.on to prevent corrupt output
Add some instructions for compilation
Installation steps that I may forget in the docs
Added modified IRRecordTest.ino

Basically the same as the one from ladyada but with different options
for output.
Support for Gitorious default webhook POST
modified dc
fixed select design
changed CR to create P element instead of DIV/BR combo
add a ".wrapper" css class  to the main divs , insert a global #wrapper div
Re-indent CSS, Move comments to CSSEdit like groups, SCP design improvements (requires Previous Headerfooter commit)
Re-indent CSS, Move comments to CSSEdit like groups, Main page design improvements
Re-indent CSS, Improve SCP login window
Some fixes fro my beloved IE….
SEO friendly directory urls
Some desc for the pop must be given, and data is by default public...and more
Added functionality for adding items

It is now fully functional to add items to selected catalogs.
Added a ReadMe - Source.txt file to document the source code.
Added IoC-container to the MVC DependencyResolver.
Better mobile rendition
Added an ability to mark a tile as MAYBE (question mark)
Merge branch 'master' into gh-pages
Setup avatar upload with S3.
unsetvar is now working
Merge branch 'master' of https://github.com/sorakatsuki/sh142
Display <object> 'graphs'
Use two decimals
Adding HTML5 Boilerplate in the README
alias be for bundle exec
Closes #3 - Update product version and build for 5.0.1
stackexchange api call fixed with apikey
Correctly indent a single line redef.
Multiple indentation fixes.
Removal of debugging messages.
Added bro-run and bro-run-region
bro-insert-event is available from points other than beginning-of-line
Documentation updates.
Fixed phpdoc.

Swift_Message::newInstance() returns an instance of its self but the doc specified Swift_Mime_Message
phpdoc cleanup
Fix project name in build.xml file
Intel 7 Series fixes (addition of QM77, fixed straps printing).

I looked at the datasheet to be sure that the strap names (SPI, PCI,
LPC) are the same as on the series 5 and 6 chipsets.

Signed-off-by: Helge Wagner <Helge.Wagner@ge.com>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>

git-svn-id: svn://coreboot.org/flashrom/trunk@1553 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Capfile / Gemfile updates
Fix deployment configs
working on better chain function
GET /chunks.json returning success
Fixing the removal of debug opcodes
adding information
make sure we remove the bitwise opcode if there doesn't have any
Adding the 'safe' removal of trace statements
Fixing the merging of abc files
added 2 print screens and a point in the testprotocol
Merge branch 'master' of github.com:stocyr/LaserChess
projektdoku gemerged
Update to get latest ros pkgs, also init workspace
Organizando o código.
Separado em reconhecer rosto e olhos.

Signed-off-by: Cristiano Fernandes <cristianobfernandes@gmail.com>
add current directory to theme
use smiley face
Add ScannerCleaner back into Thrift

This patch adds ScannerCleaner back into the thrift server
Move to special SU pom
admins homepage und readme
adds votes resource
Merge branch 'master' into devise

Conflicts:
	app/controllers/reports_controller.rb
	app/controllers/users_controller.rb
	app/models/report.rb
	app/models/user.rb
Cleanups and updated README
fix a bug in downloading the content of notes
flere opdateringer
Added file-roller.
Added Shield, Regios, and WorldGuard checkers
SERVER-7700 scoped_db_conn_test failing

Made sure that the handler object is not destroyed while there are active threads running threanRun (renamed to handleIncomingMsg)
Fix unused variable warning for shard_conn_test and scoped_db_conn_test
Include description in results.json
Add an HTML formatter
fix to depend to mysql2-cs-bind
Added `getPixels` test